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

[Ron Sigal]

  User: rsigal  
  Date: 07/01/22 19:57:36

  Modified:    src/main/org/jboss/remoting/transport/socket  Tag:
                        remoting_2_x MicroSocketClientInvoker.java
  Log:
  JBREM-684:  In transport() oneway invocations return socket to pool.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.16.2.9  +14 -10    JBossRemoting/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MicroSocketClientInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java,v
  retrieving revision 1.16.2.8
  retrieving revision 1.16.2.9
  diff -u -b -r1.16.2.8 -r1.16.2.9
  --- MicroSocketClientInvoker.java	21 Jan 2007 10:21:27 -0000	1.16.2.8
  +++ MicroSocketClientInvoker.java	23 Jan 2007 00:57:36 -0000	1.16.2.9
  @@ -32,7 +32,7 @@
    *
    * @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.16.2.8 $
  + * @version $Revision: 1.16.2.9 $
    */
   public class MicroSocketClientInvoker extends RemoteClientInvoker
   {
  @@ -351,16 +351,19 @@
               start = System.currentTimeMillis();
   
               // check to see if is one way invocation and return if is
  +            boolean oneway = false;
               if(metadata != null)
               {
                  Object val = metadata.get(org.jboss.remoting.Client.ONEWAY_FLAG);
                  if(val != null && val instanceof String && Boolean.valueOf((String)val).booleanValue())
                  {
                     if(trace) { log.trace(this + " sent oneway invocation, so not waiting for response, returning null"); }
  -                  return null;
  +                  oneway = true;
                  }
               }
   
  +            if (!oneway)
  +            {
               InputStream inputStream = socketWrapper.getInputStream();
               if (performVersioning)
               {
  @@ -372,6 +375,7 @@
               }
   
               response = versionedRead(inputStream, unmarshaller, version);
  +            }
   
               end = System.currentTimeMillis() - start;
               readTime += end;