You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2015/03/16 20:06:36 UTC
tomee git commit: TOMEE-1526 global (conf/system.properties)
openejb.datasource.pool support
Repository: tomee
Updated Branches:
refs/heads/tomee-1.7.x 00ef270de -> d0b7ae237
TOMEE-1526 global (conf/system.properties) openejb.datasource.pool support
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/d0b7ae23
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/d0b7ae23
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/d0b7ae23
Branch: refs/heads/tomee-1.7.x
Commit: d0b7ae2372f81e26544f4944813ba96311e45c8e
Parents: 00ef270
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Mon Mar 16 20:04:24 2015 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Mon Mar 16 20:04:24 2015 +0100
----------------------------------------------------------------------
.../resource/jdbc/DataSourceFactory.java | 2 +-
.../resource/jdbc/DataSourceFactoryTest.java | 59 ++++++++++++++++++++
2 files changed, 60 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/d0b7ae23/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java
index 219283a..e68c2c1 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java
@@ -333,7 +333,7 @@ public class DataSourceFactory {
}
private static boolean usePool(final Properties properties) {
- String property = properties.getProperty(POOL_PROPERTY);
+ String property = properties.getProperty(POOL_PROPERTY, SystemInstance.get().getProperty(POOL_PROPERTY));
if (property != null) {
properties.remove(POOL_PROPERTY);
} else { // defined from @DataSourceDefinition and doesn't need pooling
http://git-wip-us.apache.org/repos/asf/tomee/blob/d0b7ae23/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/DataSourceFactoryTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/DataSourceFactoryTest.java b/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/DataSourceFactoryTest.java
new file mode 100644
index 0000000..be960e3
--- /dev/null
+++ b/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/DataSourceFactoryTest.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.resource.jdbc;
+
+import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.testng.PropertiesBuilder;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.lang.reflect.Method;
+import java.util.Properties;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class DataSourceFactoryTest {
+ private static Method mtd;
+
+ @BeforeClass
+ public static void findMethod() throws NoSuchMethodException {
+ mtd = DataSourceFactory.class.getDeclaredMethod("usePool", Properties.class);
+ mtd.setAccessible(true);
+ }
+
+ @After
+ @Before
+ public void reset() {
+ SystemInstance.reset();
+ }
+
+ @Test
+ public void run() throws Exception {
+ assertFalse(Boolean.class.cast(mtd.invoke(null, new Properties())));
+ assertTrue(Boolean.class.cast(mtd.invoke(null, new PropertiesBuilder().p("openejb.datasource.pool", "true").build())));
+ assertFalse(Boolean.class.cast(mtd.invoke(null, new PropertiesBuilder().p("openejb.datasource.pool", "false").build())));
+ assertTrue(Boolean.class.cast(mtd.invoke(null, new PropertiesBuilder().p("initialPoolSize", "1").build())));
+ assertTrue(Boolean.class.cast(mtd.invoke(null, new PropertiesBuilder().p("maxPoolSize", "1").build())));
+ SystemInstance.get().setProperty("openejb.datasource.pool", "true");
+ assertTrue(Boolean.class.cast(mtd.invoke(null, new Properties())));
+ SystemInstance.get().setProperty("openejb.datasource.pool", "false");
+ assertFalse(Boolean.class.cast(mtd.invoke(null, new Properties())));
+ }
+}