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/04/06 20:45:21 UTC
svn commit: r526246 - in /db/jdo/trunk/api20: project.xml
src/java/javax/jdo/JDOHelper.java
Author: madams
Date: Fri Apr 6 11:45:20 2007
New Revision: 526246
URL: http://svn.apache.org/viewvc?view=rev&rev=526246
Log:
JDO-477
Minor fix that handles accidental duplicate resources discovered in maven testing. Also forgot to commit change to project.xml. This commit does not fix the LinkageError issues.
Modified:
db/jdo/trunk/api20/project.xml
db/jdo/trunk/api20/src/java/javax/jdo/JDOHelper.java
Modified: db/jdo/trunk/api20/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api20/project.xml?view=diff&rev=526246&r1=526245&r2=526246
==============================================================================
--- db/jdo/trunk/api20/project.xml (original)
+++ db/jdo/trunk/api20/project.xml Fri Apr 6 11:45:20 2007
@@ -78,6 +78,7 @@
<include>**/*.jdo</include>
<include>**/*.jdoquery</include>
<include>**/*.orm</include>
+ <include>**/jdoconfig.xml</include>
</includes>
</resource>
</resources>
Modified: db/jdo/trunk/api20/src/java/javax/jdo/JDOHelper.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api20/src/java/javax/jdo/JDOHelper.java?view=diff&rev=526246&r1=526245&r2=526246
==============================================================================
--- db/jdo/trunk/api20/src/java/javax/jdo/JDOHelper.java (original)
+++ db/jdo/trunk/api20/src/java/javax/jdo/JDOHelper.java Fri Apr 6 11:45:20 2007
@@ -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/*<String,Map>*/ propertiesByNameInCurrentConfig =
readPersistenceUnitProperties(
currentConfigURL, name, factory);