You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by fa...@apache.org on 2009/02/08 02:43:56 UTC
svn commit: r741995 - in /openjpa/branches/1.3.x:
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestChainEntities.java
Author: fancy
Date: Sun Feb 8 01:43:55 2009
New Revision: 741995
URL: http://svn.apache.org/viewvc?rev=741995&view=rev
Log:
OPENJPA-912 Potential NPE in setInverseRelation
Modified:
openjpa/branches/1.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestChainEntities.java
Modified: openjpa/branches/1.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java?rev=741995&r1=741994&r2=741995&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java (original)
+++ openjpa/branches/1.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java Sun Feb 8 01:43:55 2009
@@ -406,6 +406,10 @@
for (Iterator itr = ((Collection) coll).iterator();
itr.hasNext();) {
PersistenceCapable pc = (PersistenceCapable) itr.next();
+
+ if (pc == null)
+ continue;
+
OpenJPAStateManager sm = (OpenJPAStateManager) pc.
pcGetStateManager();
FieldMapping[] fmd = ((ClassMapping) sm.getMetaData()).
Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestChainEntities.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestChainEntities.java?rev=741995&r1=741994&r2=741995&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestChainEntities.java (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestChainEntities.java Sun Feb 8 01:43:55 2009
@@ -32,7 +32,8 @@
long aid;
public void setUp () {
- setUp (ChainEntityA.class, ChainEntityB.class, ChainEntityC.class);
+ setUp (DROP_TABLES,
+ ChainEntityA.class, ChainEntityB.class, ChainEntityC.class);
// Create A
ChainEntityA a = new ChainEntityA ();
a.setName ("TEST_A");