svn commit: r786340 - /openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractBrokerFactory.java

[mi...@apache.org]

Author: mikedd
Date: Fri Jun 19 00:11:04 2009
New Revision: 786340

URL: http://svn.apache.org/viewvc?rev=786340&view=rev
Log:
Move delegating store manager creation to a separate method

Modified:
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractBrokerFactory.java

Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractBrokerFactory.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractBrokerFactory.java?rev=786340&r1=786339&r2=786340&view=diff
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractBrokerFactory.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractBrokerFactory.java Fri Jun 19 00:11:04 2009
@@ -216,17 +216,8 @@
         BrokerImpl broker, boolean fromDeserialization) {
         assertOpen();
         makeReadOnly();
-
-        // decorate the store manager for data caching and custom
-        // result object providers; always make sure it's a delegating
-        // store manager, because it's easier for users to deal with
-        // that way
-        StoreManager sm = newStoreManager();
-        DelegatingStoreManager dsm = null;
-        if (_conf.getDataCacheManagerInstance().getSystemDataCache()
-            != null)
-            dsm = new DataCacheStoreManager(sm);
-        dsm = new ROPStoreManager((dsm == null) ? sm : dsm);
+        
+        DelegatingStoreManager dsm = createDelegatingStoreManager();
 
         broker.initialize(this, dsm, managed, connRetainMode,
             fromDeserialization);
@@ -879,4 +870,26 @@
           
        return _pcClassLoaders;
     }
+
+    /**
+     * Create a DelegatingStoreManager for use with a Broker created by this
+     * factory.
+     * 
+     * @return A DataCacheStoreManager if a DataCache is in use otherwise an
+     *         ROPStoreManager
+     */
+    protected DelegatingStoreManager createDelegatingStoreManager() { 
+        // decorate the store manager for data caching and custom
+        // result object providers; always make sure it's a delegating
+        // store manager, because it's easier for users to deal with
+        // that way
+        StoreManager sm = newStoreManager();
+        DelegatingStoreManager dsm = null;
+        if (_conf.getDataCacheManagerInstance().getSystemDataCache()
+            != null)
+            dsm = new DataCacheStoreManager(sm);
+        dsm = new ROPStoreManager((dsm == null) ? sm : dsm);
+        
+        return dsm;
+    }
 }