jackrabbit-commits mailing list archives

Author: dbrosius
Date: Wed Nov 30 05:15:05 2011
New Revision: 1208280

URL: http://svn.apache.org/viewvc?rev=1208280&view=rev
Log:
don't assign an object reference to a static field until that object is fully initialized

Modified:
    jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/CopyMoveManagerImpl.java
    jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/PropertyManagerImpl.java

Modified: jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/CopyMoveManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/CopyMoveManagerImpl.java?rev=1208280&r1=1208279&r2=1208280&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/CopyMoveManagerImpl.java
(original)
+++ jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/CopyMoveManagerImpl.java
Wed Nov 30 05:15:05 2011
@@ -95,8 +95,9 @@ public class CopyMoveManagerImpl impleme
      */
     public static CopyMoveManager getDefaultManager() {
         if (DEFAULT_MANAGER == null) {
-            DEFAULT_MANAGER = new CopyMoveManagerImpl();
-            DEFAULT_MANAGER.addCopyMoveHandler(new DefaultHandler());
+            CopyMoveManager manager = new CopyMoveManagerImpl();
+            manager.addCopyMoveHandler(new DefaultHandler());
+            DEFAULT_MANAGER = manager;
         }
         return DEFAULT_MANAGER;
     }

Modified: jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/PropertyManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/PropertyManagerImpl.java?rev=1208280&r1=1208279&r2=1208280&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/PropertyManagerImpl.java
(original)
+++ jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/PropertyManagerImpl.java
Wed Nov 30 05:15:05 2011
@@ -103,10 +103,11 @@ public class PropertyManagerImpl impleme
      */
     public static PropertyManager getDefaultManager() {
         if (DEFAULT_MANAGER == null) {
-            DEFAULT_MANAGER = new PropertyManagerImpl();
-            DEFAULT_MANAGER.addPropertyHandler(new ZipHandler());
-            DEFAULT_MANAGER.addPropertyHandler(new XmlHandler());
-            DEFAULT_MANAGER.addPropertyHandler(new DefaultHandler());
+            PropertyManager manager = new PropertyManagerImpl();
+            manager.addPropertyHandler(new ZipHandler());
+            manager.addPropertyHandler(new XmlHandler());
+            manager.addPropertyHandler(new DefaultHandler());
+            DEFAULT_MANAGER = manager;
         }
         return DEFAULT_MANAGER;
     }