[jboss-cvs] JBossRemoting/src/main/org/jboss/remoting ...

[Tom Elrod]

  User: telrod  
  Date: 06/09/25 22:27:52

  Modified:    src/main/org/jboss/remoting    Client.java Lease.java
                        ServerInvoker.java
  Log:
  JBREM-548 & JBREM-604 & JBREM-596 - updated so oneway invocations will only send data on client (and not wait for response) and only receive data on the server (and not write out response).  Also allowing socket server invoker to receive raw data from any client and send along to the handler.  Finally, fixed some issues where test cases were failing due to change leasing (JBREM-596) as well as changes made to http server invoker to work with messaging.
  
  Revision  Changes    Path
  1.51      +12 -3     JBossRemoting/src/main/org/jboss/remoting/Client.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Client.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/Client.java,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -b -r1.50 -r1.51
  --- Client.java	25 Sep 2006 23:47:02 -0000	1.50
  +++ Client.java	26 Sep 2006 02:27:52 -0000	1.51
  @@ -61,11 +61,17 @@
    *
    * @author <a href="mailto:jhaynie at vocalocity.net">Jeff Haynie</a>
    * @author <a href="mailto:telrod at e2technologies.net">Tom Elrod</a>
  - * @version $Revision: 1.50 $
  + * @version $Revision: 1.51 $
    */
   public class Client implements Externalizable
   {
      /**
  +    * Key to be used to determine if invocation is to be
  +    * oneway (async).
  +    */
  +   public static final String ONEWAY_FLAG = "oneway";
  +
  +   /**
       * Key to be used when tracking callback listeners.
       */
      public static final String LISTENER_ID_KEY = "listenerId";
  @@ -617,6 +623,9 @@
       */
      public void invokeOneway(final Object param, final Map sendPayload, boolean clientSide) throws Throwable
      {
  +      final Map internalSendPayload = sendPayload == null ? new HashMap() : sendPayload;
  +      internalSendPayload.put(ONEWAY_FLAG, "true");
  +
         if (clientSide)
         {
            ThreadPool threadPool = getOnewayThreadPool();
  @@ -626,7 +635,7 @@
               {
                  try
                  {
  -                  invoke(param, sendPayload);
  +                  invoke(param, internalSendPayload);
                  }
                  catch (Throwable e)
                  {
  @@ -640,7 +649,7 @@
         else
         {
            OnewayInvocation invocation = new OnewayInvocation(param);
  -         invoke(invocation, sendPayload);
  +         invoke(invocation, internalSendPayload);
         }
      }
   
  
  
  
  1.11      +4 -0      JBossRemoting/src/main/org/jboss/remoting/Lease.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Lease.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/Lease.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- Lease.java	20 Sep 2006 18:54:36 -0000	1.10
  +++ Lease.java	26 Sep 2006 02:27:52 -0000	1.11
  @@ -217,6 +217,10 @@
               }
            }
         }
  +      else
  +      {
  +         notifier.connectionTerminated(locatorURL, clientSessionId, null);
  +      }
      }
   
      private void stopLease()
  
  
  
  1.51      +2 -2      JBossRemoting/src/main/org/jboss/remoting/ServerInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ServerInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/ServerInvoker.java,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -b -r1.50 -r1.51
  --- ServerInvoker.java	25 Sep 2006 23:45:23 -0000	1.50
  +++ ServerInvoker.java	26 Sep 2006 02:27:52 -0000	1.51
  @@ -58,7 +58,7 @@
    *
    * @author <a href="mailto:jhaynie at vocalocity.net">Jeff Haynie</a>
    * @author <a href="mailto:tom.elrod at jboss.com">Tom Elrod</a>
  - * @version $Revision: 1.50 $
  + * @version $Revision: 1.51 $
    */
   public abstract class ServerInvoker extends AbstractInvoker implements ServerInvokerMBean
   {
  @@ -594,7 +594,7 @@
         }
         else
         {
  -         if(connectionNotifier.size() > 0)
  +         if(connectionNotifier != null && connectionNotifier.size() > 0)
            {
               this.leaseManagement=true;
            }