[exo-jcr-commits] exo-jcr SVN: r4169 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config.

[do-not-reply at jboss.org]

Author: tolusha
Date: 2011-03-24 11:51:00 -0400 (Thu, 24 Mar 2011)
New Revision: 4169

Modified:
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/RepositoryServiceConfigurationImpl.java
Log:
EXOJCR-1233: JCR configuration update dont' require dropping JCR_CONFIG table

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/RepositoryServiceConfigurationImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/RepositoryServiceConfigurationImpl.java	2011-03-23 15:25:27 UTC (rev 4168)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/RepositoryServiceConfigurationImpl.java	2011-03-24 15:51:00 UTC (rev 4169)
@@ -295,12 +295,14 @@
                {
                   merge(configurationService.getInputStream(paths[i]));
                }
-               // Store the merged configuration
-               if (configurationPersister != null)
-               {
-                  retain();
-               }
             }
+            merge(configurationService.getInputStream(param.getValue()));
+
+            // Store the merged configuration
+            if (configurationPersister != null)
+            {
+               retain();
+            }
          }
          else
          {