You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2010/11/12 20:56:52 UTC

svn commit: r1034546 - /openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java

Author: dblevins
Date: Fri Nov 12 19:56:52 2010
New Revision: 1034546

URL: http://svn.apache.org/viewvc?rev=1034546&view=rev
Log:
Yank JDK 1.6 'stringPropertyNames()' method usage

Modified:
    openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java

Modified: openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java?rev=1034546&r1=1034545&r2=1034546&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java (original)
+++ openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java Fri Nov 12 19:56:52 2010
@@ -569,9 +569,12 @@ class AppInfoBuilder {
                     logger.debug("Adjusting PersistenceUnit(name="+info.name+") property to "+lookupProperty+"="+openejbLookupClass);
                 }
 
-                final Set<String> keys = new HashSet<String>(info.properties.stringPropertyNames());
-                for (String key : keys) {
-                    if (key.matches("openjpa.Connection(DriverName|URL|UserName|Password)")) {
+                final Set<Object> keys = new HashSet<Object>(info.properties.keySet());
+                for (Object key : keys) {
+                    if (!(key instanceof String)) continue;
+
+                    String s = (String) key;
+                    if (s.matches("openjpa.Connection(DriverName|URL|UserName|Password)")) {
                         final Object o = info.properties.remove(key);
                         logger.warning("Removing PersistenceUnit(name=" + info.name + ") property " + key + "=" + o + "  [not valid in a container environment]");
                     }