jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thom...@apache.org
Subject svn commit: r1196618 - /jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/RepositoryConfigurationParser.java
Date Wed, 02 Nov 2011 15:10:14 GMT
Author: thomasm
Date: Wed Nov  2 15:10:13 2011
New Revision: 1196618

URL: http://svn.apache.org/viewvc?rev=1196618&view=rev
Log:
JCR-3116 Cluster Node ID should be trimmed

Modified:
    jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/RepositoryConfigurationParser.java

Modified: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/RepositoryConfigurationParser.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/RepositoryConfigurationParser.java?rev=1196618&r1=1196617&r2=1196618&view=diff
==============================================================================
--- jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/RepositoryConfigurationParser.java
(original)
+++ jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/RepositoryConfigurationParser.java
Wed Nov  2 15:10:13 2011
@@ -193,7 +193,7 @@ public class RepositoryConfigurationPars
     private static final String AC_PROVIDER_ELEMENT = "AccessControlProvider";
 
     /**
-     * The repositories {@link ConnectionFactory}. 
+     * The repositories {@link ConnectionFactory}.
      */
     protected final ConnectionFactory connectionFactory;
 
@@ -341,7 +341,7 @@ public class RepositoryConfigurationPars
                 maxIdleTime, template, vc, qhf, cc, dsf, rlf, dsc, connectionFactory, this);
     }
 
-    
+
     /**
      * {@inheritDoc}
      */
@@ -830,7 +830,7 @@ public class RepositoryConfigurationPars
                     File file = new File(home, CLUSTER_NODE_ID_FILE);
                     try {
                         if (file.exists() && file.canRead()) {
-                            id = FileUtils.readFileToString(file);
+                            id = FileUtils.readFileToString(file).trim();
                         } else {
                             id = UUID.randomUUID().toString();
                             FileUtils.writeStringToFile(file, id);



Mime
View raw message