Fixed JENKINS-25647

jenkinsci · Nov 19, 2014 · d88a070 · d88a070
1 parent 1da037b
commit d88a070
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -430,14 +430,14 @@
         <dependency>
             <groupId>net.praqma</groupId>
             <artifactId>cool</artifactId>
-            <version>0.6.35</version>
+            <version>0.6.36</version>
             <type>jar</type>
         </dependency>
 
         <dependency>
             <groupId>net.praqma</groupId>
             <artifactId>cool</artifactId>
-            <version>0.6.35</version>
+            <version>0.6.36</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>

diff --git a/src/main/java/net/praqma/hudson/Util.java b/src/main/java/net/praqma/hudson/Util.java
@@ -238,7 +238,7 @@ public static SnapshotView makeView( Stream stream, File workspace, BuildListene
 		if( update ) {
 			try {
 				hudsonOut.println( "[" + Config.nameShort + "] Updating view using " + loadModule.toLowerCase() + " modules." );
-                UpdateView uw = new UpdateView(snapview).swipe().generate().overwrite().setLoadRules(new LoadRules2( snapview, Components.valueOf( loadModule.toUpperCase() ) ));
+                UpdateView uw = new UpdateView(snapview).swipe().generate().overwrite().setLoadRules(new LoadRules2(Components.valueOf( loadModule.toUpperCase() ) ));
                 uw.update();				
 			} catch( ClearCaseException e ) {
 				e.print( hudsonOut );

diff --git a/src/main/java/net/praqma/hudson/remoting/CheckoutTask.java b/src/main/java/net/praqma/hudson/remoting/CheckoutTask.java
@@ -190,7 +190,7 @@ private void makeWorkspace(File workspace, String viewtag) throws ScmException,
                 upview = upview.generate().overwrite();
             }
 
-            upview.setLoadRules(new LoadRules2(sv, Components.valueOf(loadModule.toUpperCase())));
+            upview.setLoadRules(new LoadRules2(Components.valueOf(loadModule.toUpperCase())));
             //sv.Update(swipe, true, true, false, new LoadRules2(sv, Components.valueOf(loadModule.toUpperCase())));
             upview.update();            
             logger.fine("Updating done");

diff --git a/src/main/java/net/praqma/hudson/remoting/deliver/StartDeliver.java b/src/main/java/net/praqma/hudson/remoting/deliver/StartDeliver.java
@@ -47,7 +47,6 @@ public StartDeliver( BuildListener listener, Stream destinationStream, Baseline
         this.swipe = swipe;
     }
 
-
     @Override
     public Boolean invoke( File workspace, VirtualChannel channel ) throws IOException, InterruptedException {
         logger.fine( "Start deliver" );
@@ -96,10 +95,8 @@ private void deliver( Baseline baseline, Stream dstream, boolean forceDeliver, i
                             upview = upview.generate().overwrite();
                         }
 
-                        upview.setLoadRules(new SnapshotView.LoadRules2(snapview, SnapshotView.Components.valueOf(loadModule.toUpperCase())));
+                        upview.setLoadRules(new SnapshotView.LoadRules2(SnapshotView.Components.valueOf(loadModule.toUpperCase())));
                         upview.update();
-                        //snapview.Update( swipe, true, true, false, new SnapshotView.LoadRules2( snapview, SnapshotView.Components.valueOf( loadModule.toUpperCase() ) ) );
-
                     } catch( ClearCaseException ex ) {
                         throw ex;
                     } catch (IOException ioex) {