svn commit: r1365198 - /openejb/branches/openejb-pool/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java

[rmannibucau]

Author: rmannibucau
Date: Tue Jul 24 18:11:55 2012
New Revision: 1365198

URL: http://svn.apache.org/viewvc?rev=1365198&view=rev
Log:
less filtering for tomcat pool props

Modified:
    
openejb/branches/openejb-pool/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java

Modified: 
openejb/branches/openejb-pool/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java
URL: 
http://svn.apache.org/viewvc/openejb/branches/openejb-pool/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java?rev=1365198&r1=1365197&r2=1365198&view=diff
==============================================================================
--- 
openejb/branches/openejb-pool/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java
 (original)
+++ 
openejb/branches/openejb-pool/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java
 Tue Jul 24 18:11:55 2012
@@ -61,12 +61,9 @@ public class TomEEDataSourceCreator exte
             converted.setProperty("username", properties.getProperty("user"));
         }
         for (Map.Entry<Object, Object> entry : properties.entrySet()) {
-            for (String key : PropertiesReader.KEYS) {
-                final String thisKey = entry.getKey().toString();
-                final String value = entry.getValue().toString().trim();
-                if (key.equalsIgnoreCase(thisKey) && !value.isEmpty()) {
-                    converted.put(key, entry.getValue());
-                }
+            final String value = entry.getValue().toString().trim();
+            if (!value.isEmpty()) {
+                converted.put(entry.getKey(), entry.getValue());
             }
         }
     }
@@ -78,10 +75,6 @@ public class TomEEDataSourceCreator exte
         ds.postDeregister();
     }
 
-    private static class PropertiesReader extends DataSourceFactory {
-        public static final String[] KEYS = ALL_PROPERTIES;
-    }
-
     public static class TomEEDataSource extends 
org.apache.tomcat.jdbc.pool.DataSource {
         public TomEEDataSource(final ConnectionPool pool) {
             this.pool = pool;