You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by ma...@apache.org on 2007/12/26 23:43:08 UTC

svn commit: r606963 - in /db/jdo/trunk: api2-legacy/src/java/javax/jdo/JDOHelper.java api2/src/java/javax/jdo/JDOHelper.java

Author: madams
Date: Wed Dec 26 14:43:06 2007
New Revision: 606963

URL: http://svn.apache.org/viewvc?rev=606963&view=rev
Log:
Added missing PROPERTY_SPI_RESOURCE_NAME removal in getPersistenceManagerFactory(Map,String,ClassLoader,ClassLoader) to guarantee proper communication to JDO implementation that properties were loaded via jdoconfig.xml and not a properties resource.

Modified:
    db/jdo/trunk/api2-legacy/src/java/javax/jdo/JDOHelper.java
    db/jdo/trunk/api2/src/java/javax/jdo/JDOHelper.java

Modified: db/jdo/trunk/api2-legacy/src/java/javax/jdo/JDOHelper.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2-legacy/src/java/javax/jdo/JDOHelper.java?rev=606963&r1=606962&r2=606963&view=diff
==============================================================================
--- db/jdo/trunk/api2-legacy/src/java/javax/jdo/JDOHelper.java (original)
+++ db/jdo/trunk/api2-legacy/src/java/javax/jdo/JDOHelper.java Wed Dec 26 14:43:06 2007
@@ -976,6 +976,7 @@
                 // inform the impl that the config came from a jdoconfig.xml
                 // element with the given name
                 properties.put(PROPERTY_NAME, name);
+                properties.remove(PROPERTY_SPI_RESOURCE_NAME);
             }
         }
 

Modified: db/jdo/trunk/api2/src/java/javax/jdo/JDOHelper.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/JDOHelper.java?rev=606963&r1=606962&r2=606963&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/JDOHelper.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/JDOHelper.java Wed Dec 26 14:43:06 2007
@@ -1051,6 +1051,7 @@
                 // inform the impl that the config came from a jdoconfig.xml
                 // element with the given name
                 properties.put(PROPERTY_NAME, name);
+                properties.remove(PROPERTY_SPI_RESOURCE_NAME);
             }
         }