You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by pc...@apache.org on 2007/01/16 23:57:06 UTC

svn commit: r496886 - /incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataFactory.java

Author: pcl
Date: Tue Jan 16 14:57:05 2007
New Revision: 496886

URL: http://svn.apache.org/viewvc?view=rev&rev=496886
Log:
corrected debug logic; improved trace message

Modified:
    incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataFactory.java

Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataFactory.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataFactory.java?view=diff&rev=496886&r1=496885&r2=496886
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataFactory.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataFactory.java Tue Jan 16 14:57:05 2007
@@ -245,15 +245,15 @@
 
     @Override
     protected void mapPersistentTypeNames(Object rsrc, String[] names) {
-        if (!(rsrc instanceof URL)) {
+        if (rsrc.toString().endsWith(".class")) {
             if (log.isTraceEnabled())
                 log.trace(
-                    _loc.get("map-persistent-types-skipping-non-url", rsrc));
+                    _loc.get("map-persistent-types-skipping-class", rsrc));
             return;
-        } else if (rsrc.toString().endsWith(".class")) {
+        } else if (!(rsrc instanceof URL)) {
             if (log.isTraceEnabled())
                 log.trace(
-                    _loc.get("map-persistent-types-skipping-class", rsrc));
+                    _loc.get("map-persistent-types-skipping-non-url", rsrc));
             return;
         }
 
@@ -412,7 +412,7 @@
         if (rsrcs == null)
             rsrcs = Collections.singleton("META-INF/orm.xml");
         else
-			rsrcs.add ("META-INF/orm.xml");
+			rsrcs.add("META-INF/orm.xml");
 	}
 
     public void setInto(Options opts) {