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

[Tom Elrod]

  User: telrod  
  Date: 07/01/18 16:47:39

  Modified:    src/main/org/jboss/remoting/transport/bisocket  
                        BisocketServerInvoker.java
                        BisocketClientInvoker.java
  Log:
  JBREM-673 - fixed places where java.util.Timer created as non daemon and should be.
  
  Revision  Changes    Path
  1.5       +25 -25    JBossRemoting/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BisocketServerInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- BisocketServerInvoker.java	17 Jan 2007 03:03:22 -0000	1.4
  +++ BisocketServerInvoker.java	18 Jan 2007 21:47:39 -0000	1.5
  @@ -22,6 +22,21 @@
   
   package org.jboss.remoting.transport.bisocket;
   
  +import org.jboss.logging.Logger;
  +import org.jboss.remoting.Client;
  +import org.jboss.remoting.InvocationRequest;
  +import org.jboss.remoting.InvokerLocator;
  +import org.jboss.remoting.Remoting;
  +import org.jboss.remoting.ServerInvocationHandler;
  +import org.jboss.remoting.invocation.InternalInvocation;
  +import org.jboss.remoting.socketfactory.CreationListenerServerSocket;
  +import org.jboss.remoting.socketfactory.CreationListenerSocketFactory;
  +import org.jboss.remoting.socketfactory.SocketCreationListener;
  +import org.jboss.remoting.transport.PortUtil;
  +import org.jboss.remoting.transport.socket.LRUPool;
  +import org.jboss.remoting.transport.socket.ServerThread;
  +import org.jboss.remoting.transport.socket.SocketServerInvoker;
  +
   import java.io.DataInputStream;
   import java.io.DataOutputStream;
   import java.io.IOException;
  @@ -38,26 +53,11 @@
   import java.util.Timer;
   import java.util.TimerTask;
   
  -import org.jboss.remoting.Client;
  -import org.jboss.remoting.InvocationRequest;
  -import org.jboss.remoting.InvokerLocator;
  -import org.jboss.remoting.Remoting;
  -import org.jboss.remoting.ServerInvocationHandler;
  -import org.jboss.remoting.invocation.InternalInvocation;
  -import org.jboss.remoting.socketfactory.CreationListenerServerSocket;
  -import org.jboss.remoting.socketfactory.CreationListenerSocketFactory;
  -import org.jboss.remoting.socketfactory.SocketCreationListener;
  -import org.jboss.remoting.transport.PortUtil;
  -import org.jboss.remoting.transport.socket.LRUPool;
  -import org.jboss.remoting.transport.socket.ServerThread;
  -import org.jboss.remoting.transport.socket.SocketServerInvoker;
  -import org.jboss.logging.Logger;
  -
   
   /**
    *  
    * @author <a href="ron.sigal at jboss.com">Ron Sigal</a>
  - * @version $Revision: 1.4 $
  + * @version $Revision: 1.5 $
    * <p>
    * Copyright Nov 23, 2006
    * </p>
  @@ -205,7 +205,7 @@
         {
            if (timer == null)
            {
  -            timer = new Timer();
  +            timer = new Timer(true);
            }
            controlMonitorTimerTask = new ControlMonitorTimerTask();
            timer.schedule(controlMonitorTimerTask, pingFrequency, pingFrequency);
  
  
  
  1.4       +68 -68    JBossRemoting/src/main/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BisocketClientInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- BisocketClientInvoker.java	16 Jan 2007 08:16:43 -0000	1.3
  +++ BisocketClientInvoker.java	18 Jan 2007 21:47:39 -0000	1.4
  @@ -22,6 +22,17 @@
   
   package org.jboss.remoting.transport.bisocket;
   
  +import org.jboss.logging.Logger;
  +import org.jboss.remoting.Client;
  +import org.jboss.remoting.ConnectionFailedException;
  +import org.jboss.remoting.InvocationRequest;
  +import org.jboss.remoting.InvokerLocator;
  +import org.jboss.remoting.invocation.InternalInvocation;
  +import org.jboss.remoting.marshal.Marshaller;
  +import org.jboss.remoting.marshal.UnMarshaller;
  +import org.jboss.remoting.transport.BidirectionalClientInvoker;
  +import org.jboss.remoting.transport.socket.SocketClientInvoker;
  +
   import java.io.IOException;
   import java.io.OutputStream;
   import java.net.Socket;
  @@ -34,17 +45,6 @@
   import java.util.Timer;
   import java.util.TimerTask;
   
  -import org.jboss.logging.Logger;
  -import org.jboss.remoting.Client;
  -import org.jboss.remoting.ConnectionFailedException;
  -import org.jboss.remoting.InvocationRequest;
  -import org.jboss.remoting.InvokerLocator;
  -import org.jboss.remoting.invocation.InternalInvocation;
  -import org.jboss.remoting.marshal.Marshaller;
  -import org.jboss.remoting.marshal.UnMarshaller;
  -import org.jboss.remoting.transport.BidirectionalClientInvoker;
  -import org.jboss.remoting.transport.socket.SocketClientInvoker;
  -
   /**
    * The bisocket transport, an extension of the socket transport, is designed to allow
    * a callback server to function behind a firewall.  All connections are created by
  @@ -290,7 +290,7 @@
               pingTimerTask = new PingTimerTask();
               if (timer == null)
               {
  -               timer = new Timer();
  +               timer = new Timer(true);
               }
               timer.schedule(pingTimerTask, pingFrequency, pingFrequency);
            }
  @@ -346,7 +346,7 @@
         pingTimerTask = new PingTimerTask();
         if (timer == null)
         {
  -         timer = new Timer();
  +         timer = new Timer(true);
         }
         timer.schedule(pingTimerTask, pingFrequency, pingFrequency);
      }