Index: project.xml
===================================================================
--- project.xml (revision 526188)
+++ project.xml (working copy)
@@ -78,6 +78,7 @@
**/*.jdo
**/*.jdoquery
**/*.orm
+ **/jdoconfig.xml
Index: src/java/javax/jdo/JDOHelper.java
===================================================================
--- src/java/javax/jdo/JDOHelper.java (revision 526188)
+++ src/java/javax/jdo/JDOHelper.java (working copy)
@@ -935,6 +935,7 @@
resourceLoader.getResources(jdoconfigResourceName);
if (resources.hasMoreElements()) {
+ ArrayList processedResources = new ArrayList();
// get ready to parse XML
DocumentBuilderFactory factory = null;
@@ -948,6 +949,13 @@
do {
URL currentConfigURL = (URL) resources.nextElement();
+ if (processedResources.contains(currentConfigURL)) {
+ continue;
+ }
+ else {
+ processedResources.add(currentConfigURL);
+ }
+
Map/**/ propertiesByNameInCurrentConfig =
readPersistenceUnitProperties(
currentConfigURL, name, factory);