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/13 00:06:08 UTC
svn commit: r1034595 -
/openejb/branches/openejb-3.1.4/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
Author: dblevins
Date: Fri Nov 12 23:06:07 2010
New Revision: 1034595
URL: http://svn.apache.org/viewvc?rev=1034595&view=rev
Log:
svn merge -r 1034545:1034546 https://svn.apache.org/repos/asf/openejb/branches/openejb-3.1.x
http://svn.apache.org/viewvc?view=revision&revision=1034546
------------------------------------------------------------------------
r1034546 | dblevins | 2010-11-12 11:56:52 -0800 (Fri, 12 Nov 2010) | 1 line
Yank JDK 1.6 'stringPropertyNames()' method usage
------------------------------------------------------------------------
Modified:
openejb/branches/openejb-3.1.4/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
Modified: openejb/branches/openejb-3.1.4/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.4/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java?rev=1034595&r1=1034594&r2=1034595&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.4/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java (original)
+++ openejb/branches/openejb-3.1.4/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java Fri Nov 12 23:06:07 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]");
}