[Jboss-cvs] JBossAS SVN: r56511 - branches/JBoss_4_0_0_Case10829/cluster/src/main/org/jboss/invocation/pooled/server

[jboss-cvs-commits at lists.jboss.org]

Author: scott.stark at jboss.org
Date: 2006-09-01 16:49:58 -0400 (Fri, 01 Sep 2006)
New Revision: 56511

Modified:
   branches/JBoss_4_0_0_Case10829/cluster/src/main/org/jboss/invocation/pooled/server/PooledInvokerHA.java
Log:
Merge the JBAS-3300 pooled invoker patch

Modified: branches/JBoss_4_0_0_Case10829/cluster/src/main/org/jboss/invocation/pooled/server/PooledInvokerHA.java
===================================================================
--- branches/JBoss_4_0_0_Case10829/cluster/src/main/org/jboss/invocation/pooled/server/PooledInvokerHA.java	2006-09-01 18:04:45 UTC (rev 56510)
+++ branches/JBoss_4_0_0_Case10829/cluster/src/main/org/jboss/invocation/pooled/server/PooledInvokerHA.java	2006-09-01 20:49:58 UTC (rev 56511)
@@ -62,7 +62,8 @@
 
    public java.io.Serializable getStub() 
    {
-      ServerAddress sa = new ServerAddress(clientConnectAddress, clientConnectPort, enableTcpNoDelay, timeout); 
+      ServerAddress sa = new ServerAddress(clientConnectAddress,
+         clientConnectPort, enableTcpNoDelay, timeout, clientSocketFactory); 
       return new PooledInvokerProxy(sa, clientMaxPoolSize);
    }
 
@@ -155,7 +156,7 @@
             rsp.currentViewId = target.getCurrentViewId();
          }
          rsp.response = rtn;
-         return new MarshalledObject(rsp);
+         return rsp;
       }
       catch (InstanceNotFoundException e)
       {