svn commit: r1409422 - in /openjpa/branches/2.2.x: openjpa-kernel/src/main/java/org/apache/openjpa/datacache/ openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/ openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/per...

[curtisr7]

Author: curtisr7
Date: Wed Nov 14 21:32:48 2012
New Revision: 1409422

URL: http://svn.apache.org/viewvc?rev=1409422&view=rev
Log:
OPENJPA-2285: Don't recache data from an Embedded StateManager. Merged from 
trunk

Added:
    
openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPAEmbeddableDataCache.java
      - copied unchanged from r1409420, 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPAEmbeddableDataCache.java
    
openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/entities/
      - copied from r1409420, 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/entities/
Modified:
    
openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheStoreManager.java

Modified: 
openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheStoreManager.java
URL: 
http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheStoreManager.java?rev=1409422&r1=1409421&r2=1409422&view=diff
==============================================================================
--- 
openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheStoreManager.java
 (original)
+++ 
openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheStoreManager.java
 Wed Nov 14 21:32:48 2012
@@ -482,7 +482,8 @@ public class DataCacheStoreManager exten
     private void updateDataCache(boolean found, OpenJPAStateManager sm, 
FetchConfiguration fetch,
         boolean loadedFieldsChanged) {
 
-        if (!_ctx.getPopulateDataCache() || sm == null || 
fetch.getCacheStoreMode() == DataCacheStoreMode.BYPASS) {
+        if (!_ctx.getPopulateDataCache() || sm == null || sm.isEmbedded()
+            || fetch.getCacheStoreMode() == DataCacheStoreMode.BYPASS) {
             return;
         }