svn commit: r1364173 - /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java

[rmannibucau]

Author: rmannibucau
Date: Sat Jul 21 21:09:57 2012
New Revision: 1364173

URL: http://svn.apache.org/viewvc?rev=1364173&view=rev
Log:
unused import + utility method for lisibility

Modified:
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java?rev=1364173&r1=1364172&r2=1364173&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java
 Sat Jul 21 21:09:57 2012
@@ -34,7 +34,6 @@ import java.io.IOException;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.sql.SQLException;
-import java.util.Map;
 import java.util.Properties;
 
 /**
@@ -59,10 +58,10 @@ public class DataSourceFactory {
 
             DataSource dataSource = (DataSource) recipe.create();
 
-            if (managed) {
+            if (managed) { // TODO: same than for not managed when we'll get a 
proxy to manage tx for ds
                 ds = new DbcpManagedDataSource(name, dataSource);
             } else {
-                if 
("true".equalsIgnoreCase(properties.getProperty(POOL_PROPERTY, "true"))) {
+                if (useDbcp(properties)) {
                     ds = new DbcpDataSource(name, dataSource);
                 } else {
                     ds = dataSource;
@@ -75,6 +74,10 @@ public class DataSourceFactory {
         return ds;
     }
 
+    private static boolean useDbcp(final Properties properties) {
+        return "true".equalsIgnoreCase(properties.getProperty(POOL_PROPERTY, 
"true"));
+    }
+
     private static Properties asProperties(String definition) throws 
IOException {
         final Properties properties = IO.readProperties(IO.read(definition), 
new Properties());
         trimNotSupportedDataSourceProperties(properties);