svn commit: r1333088 - in /openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel: BrokerImpl.java StateManagerImpl.java

[curtisr7]

Author: curtisr7
Date: Wed May  2 15:57:47 2012
New Revision: 1333088

URL: http://svn.apache.org/viewvc?rev=1333088&view=rev
Log:
OPENJPA-2161: Merge changes from trunk.

Modified:
    
openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java
    
openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java

Modified: 
openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java
URL: 
http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java?rev=1333088&r1=1333087&r2=1333088&view=diff
==============================================================================
--- 
openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java
 (original)
+++ 
openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java
 Wed May  2 15:57:47 2012
@@ -4970,7 +4970,7 @@ public class BrokerImpl
      * Unique id for state managers of new datastore instances without assigned
      * object ids.
      */
-    private static class StateManagerId
+    public static class StateManagerId
         implements Serializable {
 
         public static final String STRING_PREFIX = "openjpasm:";

Modified: 
openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java
URL: 
http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java?rev=1333088&r1=1333087&r2=1333088&view=diff
==============================================================================
--- 
openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java
 (original)
+++ 
openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java
 Wed May  2 15:57:47 2012
@@ -114,7 +114,7 @@ public class StateManagerImpl
 
     // information about the instance
     private transient PersistenceCapable _pc = null;
-    private transient ClassMetaData _meta = null;
+    protected transient ClassMetaData _meta = null;
     protected BitSet _loaded = null;
     private BitSet _dirty = null;
     private BitSet _flush = null;