Author: allee8285
Date: Fri Jul 13 16:22:14 2012
New Revision: 1361284
URL: http://svn.apache.org/viewvc?rev=1361284&view=rev
Log:
OPENJPA-2199 - Guard null pc value.
Modified:
openjpa/branches/2.0.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java
openjpa/branches/2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java
Modified:
openjpa/branches/2.0.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java?rev=1361284&r1=1361283&r2=1361284&view=diff
==============================================================================
---
openjpa/branches/2.0.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java
(original)
+++
openjpa/branches/2.0.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java
Fri Jul 13 16:22:14 2012
@@ -3146,11 +3146,13 @@ public class StateManagerImpl
* field manager.
*/
void provideField(PersistenceCapable pc, FieldManager store, int field) {
- FieldManager beforeFM = _fm;
- _fm = store;
- pc.pcProvideField(field);
- // Retaining original FM because of the possibility of reentrant calls
- if (beforeFM != null) _fm = beforeFM;
+ if (pc != null) {
+ FieldManager beforeFM = _fm;
+ _fm = store;
+ pc.pcProvideField(field);
+ // Retaining original FM because of the possibility of reentrant
calls
+ if (beforeFM != null) _fm = beforeFM;
+ }
}
/**
Modified:
openjpa/branches/2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java?rev=1361284&r1=1361283&r2=1361284&view=diff
==============================================================================
---
openjpa/branches/2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java
(original)
+++
openjpa/branches/2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java
Fri Jul 13 16:22:14 2012
@@ -3145,11 +3145,13 @@ public class StateManagerImpl
* field manager.
*/
void provideField(PersistenceCapable pc, FieldManager store, int field) {
- FieldManager beforeFM = _fm;
- _fm = store;
- pc.pcProvideField(field);
- // Retaining original FM because of the possibility of reentrant calls
- if (beforeFM != null) _fm = beforeFM;
+ if (pc != null) {
+ FieldManager beforeFM = _fm;
+ _fm = store;
+ pc.pcProvideField(field);
+ // Retaining original FM because of the possibility of reentrant
calls
+ if (beforeFM != null) _fm = beforeFM;
+ }
}
/**
