svn commit: r986841 - in /openjpa/trunk: openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheManagerImpl.java openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java

[curtisr7]

Author: curtisr7
Date: Wed Aug 18 18:30:18 2010
New Revision: 986841

URL: http://svn.apache.org/viewvc?rev=986841&view=rev
Log:
OPENJPA-1763: Refactoring original change.

Modified:
    
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheManagerImpl.java
    
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java

Modified: 
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheManagerImpl.java
URL: 
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheManagerImpl.java?rev=986841&r1=986840&r2=986841&view=diff
==============================================================================
--- 
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheManagerImpl.java
 (original)
+++ 
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheManagerImpl.java
 Wed Aug 18 18:30:18 2010
@@ -56,18 +56,7 @@ public class DataCacheManagerImpl
     private Set<String> _excludedTypes;
     
     public void initialize(OpenJPAConfiguration conf, ObjectValue dataCache, 
ObjectValue queryCache) {
-        _conf = conf;
-        String dc = _conf.getDataCache();
-        String qc = _conf.getQueryCache();
-        // If the DataCache or QueryCache is configured to be anything other 
than false, set the RemoteCommitProvider if
-        // there isn't one.
-        if ((dc != null && dc.contains("false") == false) || (qc != null && 
qc.contains("false") == false)) {
-            String rcp = _conf.getRemoteCommitProvider();
-            if (rcp == null) {
-                _conf.setRemoteCommitProvider("sjvm");
-            }
-        }
-        
+        _conf = conf;        
         _queryCache = (QueryCache) queryCache.instantiate(QueryCache.class, 
conf);
         if (_queryCache != null)
             _queryCache.initialize(this);

Modified: 
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java
URL: 
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java?rev=986841&r1=986840&r2=986841&view=diff
==============================================================================
--- 
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java
 (original)
+++ 
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java
 Wed Aug 18 18:30:18 2010
@@ -687,8 +687,23 @@ public class PersistenceProductDerivatio
                         addProperty(key, Configurations.combinePlugins(orig, 
(String) override));
                 }
             }
-
             super.setInto(conf, null);
+            
+            // At this point user properties have been loaded into the 
configuration. Apply any modifications based off those.
+            if (conf instanceof OpenJPAConfiguration) {
+                OpenJPAConfiguration oconf = (OpenJPAConfiguration) conf;
+                // If the datacache is enabled, make sure we have a 
RemoteCommitProvider
+                String dc = oconf.getDataCache();
+                String rcp = oconf.getRemoteCommitProvider();
+                // If the datacache is set and is something other than false
+                if (dc != null && dc.equals("false") == false) {
+                    // If RCP is null or empty, set it to sjvm.
+                    if (rcp == null || (rcp != null && rcp.equals("") == 
false)) {
+                        oconf.setRemoteCommitProvider("sjvm");
+                    }
+                }
+            }
+            
             Log log = conf.getConfigurationLog();
             if (log.isTraceEnabled()) {
                 String src = (_source == null) ? "?" : _source;