You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2011/03/16 09:24:50 UTC
svn commit: r1082085 - in /openejb/trunk/openejb3/server:
openejb-client/src/main/java/org/apache/openejb/client/SocketConnectionFactory.java
openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/FullPoolFailoverTest.java
Author: andygumbrecht
Date: Wed Mar 16 08:24:50 2011
New Revision: 1082085
URL: http://svn.apache.org/viewvc?rev=1082085&view=rev
Log:
Force use of correct property names.
Modified:
openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/SocketConnectionFactory.java
openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/FullPoolFailoverTest.java
Modified: openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/SocketConnectionFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/SocketConnectionFactory.java?rev=1082085&r1=1082084&r2=1082085&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/SocketConnectionFactory.java (original)
+++ openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/SocketConnectionFactory.java Wed Mar 16 08:24:50 2011
@@ -39,6 +39,12 @@ import java.util.concurrent.locks.Reentr
public class SocketConnectionFactory implements ConnectionFactory {
private KeepAliveStyle keepAliveStyle = KeepAliveStyle.PING;
+
+ public static final String PROPERTY_POOL_TIMEOUT = "openejb.client.connection.pool.timeout";
+ private static final String PROPERTY_POOL_TIMEOUT2 = "openejb.client.connectionpool.timeout";
+ public static final String PROPERTY_POOL_SIZE = "openejb.client.connection.pool.size";
+ private static final String PROPERTY_POOL_SIZE2 = "openejb.client.connectionpool.size";
+ public static final String PROPERTY_KEEPALIVE = "openejb.client.keepalive";
private static Map<URI, Pool> connections = new ConcurrentHashMap<URI, Pool>();
private int size = 5;
@@ -52,26 +58,28 @@ public class SocketConnectionFactory imp
private long getTimeout() {
Properties p = System.getProperties();
- long timeout = getLong(p, "openejb.client.connectionpool.timeout", this.timeout);
- timeout = getLong(p, "openejb.client.connection.pool.timeout", timeout);
+ long timeout = getLong(p, SocketConnectionFactory.PROPERTY_POOL_TIMEOUT, this.timeout);
+ timeout = getLong(p, SocketConnectionFactory.PROPERTY_POOL_TIMEOUT2, timeout);
return timeout;
}
private int getSize() {
Properties p = System.getProperties();
- int size = getInt(p, "openejb.client.connectionpool.size", this.size);
- size = getInt(p, "openejb.client.connection.pool.size", size);
+ int size = getInt(p, SocketConnectionFactory.PROPERTY_POOL_SIZE, this.size);
+ size = getInt(p, SocketConnectionFactory.PROPERTY_POOL_SIZE2, size);
return size;
}
public static int getInt(Properties p, String property, int defaultValue) {
- String value = p.getProperty(property);
+ final String value = p.getProperty(property);
try {
- if (value != null) return Integer.parseInt(value);
- else return defaultValue;
+ if (value != null) {
+ return Integer.parseInt(value);
+ }
} catch (NumberFormatException e) {
- return defaultValue;
+ //Ignore
}
+ return defaultValue;
}
public static long getLong(Properties p, String property, long defaultValue) {
@@ -146,7 +154,7 @@ public class SocketConnectionFactory imp
}
public KeepAliveStyle getKeepAliveStyle() {
- String property = System.getProperty("openejb.client.keepalive");
+ String property = System.getProperty(PROPERTY_KEEPALIVE);
if (property != null) {
property = property.toUpperCase();
return KeepAliveStyle.valueOf(property);
@@ -318,7 +326,7 @@ public class SocketConnectionFactory imp
Thread.interrupted();
}
- throw new ConnectionPoolTimeoutException("No connections available in pool (size " + size + "). Waited for " + timeout + " seconds for a connection.");
+ throw new ConnectionPoolTimeoutException("No connections available in pool (size " + size + "). Waited for " + timeout + " milliseconds for a connection.");
}
public void put(SocketConnection connection) {
Modified: openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/FullPoolFailoverTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/FullPoolFailoverTest.java?rev=1082085&r1=1082084&r2=1082085&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/FullPoolFailoverTest.java (original)
+++ openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/FullPoolFailoverTest.java Wed Mar 16 08:24:50 2011
@@ -221,7 +221,7 @@ public class FullPoolFailoverTest extend
initProps.setProperty("openejb.deployments.classpath.filter.descriptors", "true");
OpenEJB.init(initProps, new ServerFederation());
- System.setProperty("openejb.client.connectionpool.size", "" + connectionPoolSize);
+ System.setProperty(org.apache.openejb.client.SocketConnectionFactory.PROPERTY_POOL_SIZE, "" + connectionPoolSize);
EjbServer ejbServer = new EjbServer();
ejbServer.init(new Properties());