openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mprud...@apache.org
Subject svn commit: r535321 - /incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractCFMetaDataFactory.java
Date Fri, 04 May 2007 16:36:16 GMT
Author: mprudhom
Date: Fri May  4 09:36:15 2007
New Revision: 535321

URL: http://svn.apache.org/viewvc?view=rev&rev=535321
Log:
OPENJPA-148 Applied the rest of the patch for this bug.

Modified:
    incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractCFMetaDataFactory.java

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractCFMetaDataFactory.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractCFMetaDataFactory.java?view=diff&rev=535321&r1=535320&r2=535321
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractCFMetaDataFactory.java
(original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractCFMetaDataFactory.java
Fri May  4 09:36:15 2007
@@ -633,6 +633,13 @@
         if (urls != null) {
             for (Iterator itr = urls.iterator(); itr.hasNext();) {
                 url = (URL) itr.next();
+
+                if ("file".equals(url.getProtocol())) {
+                    File file = new File(url.getFile()).getAbsoluteFile();
+                    if (files.contains(file)) {
+                        continue;
+                    }
+                } 
                 if ("jar".equals(url.getProtocol())
                     && url.getPath().endsWith("!/")) {
                     if (log.isTraceEnabled())



Mime
View raw message