You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ke...@apache.org on 2010/05/18 06:09:30 UTC
svn commit: r945484 - in /geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb-clustering-wadi/src: main/java/org/apache/geronimo/openejb/cluster/container/stateless/ test/java/org/apache/geronimo/openejb/cluster/container/stateless/

Author: kevan
Date: Tue May 18 04:09:30 2010
New Revision: 945484

URL: http://svn.apache.org/viewvc?rev=945484&view=rev
Log:
Fix some build breakage caused by recent changes to OpenEJB

Modified:
    geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb-clustering-wadi/src/main/java/org/apache/geronimo/openejb/cluster/container/stateless/ClusteredStatelessContainer.java
    geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/container/stateless/ClusteredStatelessContainerTest.java

Modified: geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb-clustering-wadi/src/main/java/org/apache/geronimo/openejb/cluster/container/stateless/ClusteredStatelessContainer.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb-clustering-wadi/src/main/java/org/apache/geronimo/openejb/cluster/container/stateless/ClusteredStatelessContainer.java?rev=945484&r1=945483&r2=945484&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb-clustering-wadi/src/main/java/org/apache/geronimo/openejb/cluster/container/stateless/ClusteredStatelessContainer.java (original)
+++ geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb-clustering-wadi/src/main/java/org/apache/geronimo/openejb/cluster/container/stateless/ClusteredStatelessContainer.java Tue May 18 04:09:30 2010
@@ -50,8 +50,8 @@ public class ClusteredStatelessContainer
     private final Map<Object, Manager> deploymentIdToManager;
     private final Map<Object, NetworkConnectorTracker> deploymentIdToNetworkConnectorTracker;
 
-    public ClusteredStatelessContainer(Object id, SecurityService securityService, int timeOut, int poolSize, boolean strictPooling) throws OpenEJBException {
-        super(id, securityService, new Duration(timeOut, TimeUnit.MILLISECONDS), builder(poolSize, strictPooling), 5);
+    public ClusteredStatelessContainer(Object id, SecurityService securityService, int timeOut, int closeTimeout, int poolSize, boolean strictPooling) throws OpenEJBException {
+        super(id, securityService, new Duration(timeOut, TimeUnit.MILLISECONDS), new Duration(closeTimeout, TimeUnit.MILLISECONDS), builder(poolSize, strictPooling), 5);
 
         deploymentIdToManager = new ConcurrentHashMap<Object, Manager>();
         deploymentIdToNetworkConnectorTracker = new ConcurrentHashMap<Object, NetworkConnectorTracker>();

Modified: geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/container/stateless/ClusteredStatelessContainerTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/container/stateless/ClusteredStatelessContainerTest.java?rev=945484&r1=945483&r2=945484&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/container/stateless/ClusteredStatelessContainerTest.java (original)
+++ geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/container/stateless/ClusteredStatelessContainerTest.java Tue May 18 04:09:30 2010
@@ -62,7 +62,7 @@ public class ClusteredStatelessContainer
 
         SecurityService securityService = (SecurityService) mock(SecurityService.class);
         container = (ClusteredStatelessContainer) intercept(ClusteredStatelessContainer.class, new Object[] {"id",
-                securityService,500,10,true});
+                securityService,500,10,10,true});
         deploymentId = "deploymentId";
         deploymentInfo = new CoreDeploymentInfo(new DeploymentContext(deploymentId, null, null),
             SFSB.class,