[exo-jcr-commits] exo-jcr SVN: r555 - jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent.

[do-not-reply at jboss.org]

Author: tolusha
Date: 2009-11-11 03:22:24 -0500 (Wed, 11 Nov 2009)
New Revision: 555

Modified:
   jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java
Log:
EXOJCR-201: bug fix

Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java	2009-11-11 08:20:33 UTC (rev 554)
+++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java	2009-11-11 08:22:24 UTC (rev 555)
@@ -164,32 +164,24 @@
                WorkspaceStorageConnection conn = null;
                if (isSystemDescendant(data.getQPath()))
                {
-                  if (systemConnection == null)
-                  {
-                     conn = systemConnection == null
-                     // we need system connection but it's not exist
-                        ? systemConnection = (systemDataContainer != dataContainer
-                        // if it's different container instances
-                           ? systemDataContainer.equals(dataContainer) && thisConnection != null
-                           // but container confugrations are same and non-system connnection open
-                              // reuse this connection as system
-                              ? systemDataContainer.reuseConnection(thisConnection)
-                              // or open one new system
-                              : systemDataContainer.openConnection()
-                           // else if it's same container instances (system and this)
-                           : thisConnection == null
-                           // and non-system connection doens't exist - open it
-                              ? thisConnection = dataContainer.openConnection()
-                              // if already open - use it
-                              : thisConnection)
-                        // system connection opened - use it
-                        : systemConnection;
-                  }
-                  else
-                  {
+                  conn = systemConnection == null
+                  // we need system connection but it's not exist
+                     ? systemConnection = (systemDataContainer != dataContainer
+                     // if it's different container instances
+                        ? systemDataContainer.equals(dataContainer) && thisConnection != null
+                        // but container confugrations are same and non-system connnection open
+                           // reuse this connection as system
+                           ? systemDataContainer.reuseConnection(thisConnection)
+                           // or open one new system
+                           : systemDataContainer.openConnection()
+                        // else if it's same container instances (system and this)
+                        : thisConnection == null
+                        // and non-system connection doens't exist - open it
+                           ? thisConnection = dataContainer.openConnection()
+                           // if already open - use it
+                           : thisConnection)
                      // system connection opened - use it
-                     conn = systemConnection;
-                  }
+                     : systemConnection;
                }
                else
                {