svn commit: r734807 - /openjpa/branches/1.3.x/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractCFMetaDataFactory.java

[mikedd]

Author: mikedd
Date: Thu Jan 15 12:26:50 2009
New Revision: 734807

URL: http://svn.apache.org/viewvc?rev=734807&view=rev
Log:
OPENJPA-860 improve trace. Entity class names are printed when found in 
orm.xml. Merged to 1.3.x

Modified:
    
openjpa/branches/1.3.x/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractCFMetaDataFactory.java

Modified: 
openjpa/branches/1.3.x/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractCFMetaDataFactory.java
URL: 
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractCFMetaDataFactory.java?rev=734807&r1=734806&r2=734807&view=diff
==============================================================================
--- 
openjpa/branches/1.3.x/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractCFMetaDataFactory.java
 (original)
+++ 
openjpa/branches/1.3.x/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractCFMetaDataFactory.java
 Thu Jan 15 12:26:50 2009
@@ -626,7 +626,7 @@
         throws IOException {
         ClassArgParser cparser = newClassArgParser();
         String[] clss;
-        Set names = new HashSet();
+        Set<String> names = new HashSet<String>();
         if (files != null) {
             File file;
             for (Iterator itr = files.iterator(); itr.hasNext();) {
@@ -654,9 +654,10 @@
                         log.trace(_loc.get("scanning-file", file));
                     clss = cparser.parseTypeNames(new FileMetaDataIterator
                         (file));
+                    List<String> newNames = Arrays.asList(clss);
                     if (log.isTraceEnabled())
-                        log.trace(_loc.get("scan-found-names", clss, file));
-                    names.addAll(Arrays.asList(clss));
+                        log.trace(_loc.get("scan-found-names", newNames, 
file));
+                    names.addAll(newNames);
                     File f = (File) AccessController
                         .doPrivileged(J2DoPrivHelper
                             .getAbsoluteFileAction(file));
@@ -713,9 +714,10 @@
                     if (log.isTraceEnabled())
                         log.trace(_loc.get("scanning-url", url));
                     clss = cparser.parseTypeNames(new 
URLMetaDataIterator(url));
+                    List<String> newNames = Arrays.asList(clss);
                     if (log.isTraceEnabled())
-                        log.trace(_loc.get("scan-found-names", clss, url));
-                    names.addAll(Arrays.asList(clss));
+                        log.trace(_loc.get("scan-found-names", newNames, url));
+                    names.addAll(newNames);
                     mapPersistentTypeNames(url, clss);
                 }
             }
@@ -751,9 +753,10 @@
                         url = (URL) mitr.next();
                         clss = cparser.parseTypeNames(new URLMetaDataIterator
                             (url));
+                        List<String> newNames = Arrays.asList(clss);
                         if (log.isTraceEnabled())
                             log.trace(_loc.get("scan-found-names", clss, 
rsrc));
-                        names.addAll(Arrays.asList(clss));
+                        names.addAll(newNames);
                         mapPersistentTypeNames(url, clss);
                     }
                     mitr.close();