maven-wagon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tryg...@apache.org
Subject svn commit: r290699 - /maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/ScpWagon.java
Date Wed, 21 Sep 2005 13:54:36 GMT
Author: trygvis
Date: Wed Sep 21 06:54:33 2005
New Revision: 290699

URL: http://svn.apache.org/viewcvs?rev=290699&view=rev
Log:
Fixing WAGONSSH-14: "another NPE introduced by me :("
o Problem and patch created by Juan F. Codagnone.

Modified:
    maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/ScpWagon.java

Modified: maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/ScpWagon.java
URL: http://svn.apache.org/viewcvs/maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/ScpWagon.java?rev=290699&r1=290698&r2=290699&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/ScpWagon.java
(original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/ScpWagon.java
Wed Sep 21 06:54:33 2005
@@ -242,19 +242,18 @@
         firePutInitiated( resource, source );
 
         String umaskCmd = "";
+
         if ( getRepository().getPermissions() != null )
         {
-            final String dirPerms = getRepository().getPermissions().getDirectoryMode();
+            String dirPerms = getRepository().getPermissions().getDirectoryMode();
+
             if ( dirPerms != null )
             {
                 umaskCmd = "umask " + PermissionModeUtils.getUserMaskFor( dirPerms ) + "\n";
-                executeCommand( umaskCmd );
             }
         }
 
-        String mkdirCmd = umaskCmd + "mkdir -p -m "
-                          + getRepository().getPermissions().getDirectoryMode()
-                          + " " + basedir + "/" + dir + "\n";
+        String mkdirCmd = umaskCmd + "mkdir -p -m " + basedir + "/" + dir + "\n";
 
         executeCommand( mkdirCmd );
 



---------------------------------------------------------------------
To unsubscribe, e-mail: wagon-cvs-unsubscribe@maven.apache.org
For additional commands, e-mail: wagon-cvs-help@maven.apache.org


Mime
View raw message