You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm-commits@maven.apache.org by be...@apache.org on 2008/08/16 16:42:17 UTC

svn commit: r686507 - /maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyCCM.java

Author: bentmann
Date: Sat Aug 16 07:42:17 2008
New Revision: 686507

URL: http://svn.apache.org/viewvc?rev=686507&view=rev
Log:
o Fixed bug introduced in r686352

Modified:
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyCCM.java

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyCCM.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyCCM.java?rev=686507&r1=686506&r2=686507&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyCCM.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyCCM.java Sat Aug 16 07:42:17 2008
@@ -751,7 +751,7 @@
             {
                 String key = (String) i.next();
 
-                if ( !key.toUpperCase().equals( "ccmAddr" ) )
+                if ( !key.equalsIgnoreCase( "CCM_ADDR" ) )
                 {
 
                     cl.addEnvironment( key, envVars.getProperty( key ) );
@@ -764,7 +764,7 @@
             throw new ScmException( "Fail to add PATH environment variable.", e1 );
 
         }
-        cl.addEnvironment( "ccmAddr", ccmAddr );
+        cl.addEnvironment( "CCM_ADDR", ccmAddr );
 
     }
 
@@ -786,7 +786,7 @@
         cl.createArgument().setValue( START );
         cl.createArgument().setValue( "-nogui" );
         cl.createArgument().setValue( "-m" ); // Multissesion
-        cl.createArgument().setValue( "-q" ); // Quiet (return only ccmAddr)
+        cl.createArgument().setValue( "-q" ); // Quiet (return only CCM_ADDR)
         cl.createArgument().setValue( "-n" );
         cl.createArgument().setValue( username );
         cl.createArgument().setValue( "-pw" );