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

[Ron Sigal]

  User: rsigal  
  Date: 07/01/16 00:43:22

  Modified:    src/main/org/jboss/remoting  Tag: remoting_2_x
                        AbstractInvoker.java
  Log:
  JBREM-298, JBREM-622: (1) Stripped sessionId from unique listenerid; (2)  Added ability to wrap SocketFactory with CreationListenerSocketFactory.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.12.4.8  +44 -8     JBossRemoting/src/main/org/jboss/remoting/AbstractInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AbstractInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/AbstractInvoker.java,v
  retrieving revision 1.12.4.7
  retrieving revision 1.12.4.8
  diff -u -b -r1.12.4.7 -r1.12.4.8
  --- AbstractInvoker.java	13 Jan 2007 12:42:34 -0000	1.12.4.7
  +++ AbstractInvoker.java	16 Jan 2007 05:43:22 -0000	1.12.4.8
  @@ -27,6 +27,9 @@
   import org.jboss.remoting.marshal.MarshallLoaderFactory;
   import org.jboss.remoting.security.SSLSocketBuilder;
   import org.jboss.remoting.serialization.SerializationStreamFactory;
  +import org.jboss.remoting.socketfactory.CreationListenerSocketFactory;
  +import org.jboss.remoting.socketfactory.SocketCreationListener;
  +import org.jboss.remoting.socketfactory.SocketFactoryWrapper;
   import org.jboss.remoting.serialization.ClassLoaderUtility;
   import org.jboss.remoting.callback.InvokerCallbackHandler;
   import org.jboss.util.id.GUID;
  @@ -48,12 +51,11 @@
    *
    * @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.12.4.7 $
  + * @version $Revision: 1.12.4.8 $
    */
   public abstract class AbstractInvoker implements Invoker
   {
  -   private static final Logger log = Logger.getLogger(AbstractInvoker.class);
  -
  +   protected final Logger log = Logger.getLogger(getClass());
      protected ClassByteClassLoader classbyteloader;
      protected InvokerLocator locator;
      protected Map localServerLocators = new HashMap();
  @@ -140,9 +142,10 @@
            // if got this far, the entry does not exist, so need to add it and create a listener id
            CallbackHandlerHolder holder = new CallbackHandlerHolder(callbackhandler, locator);
            listenerId = new GUID().toString();
  +         String key = listenerId;
            if (sessionId != null)
  -            listenerId = sessionId + "+" + listenerId;
  -         localServerLocators.put(listenerId, holder);
  +            key = sessionId + "+" + listenerId;
  +         localServerLocators.put(key, holder);
         }
   
         return listenerId;
  @@ -179,9 +182,12 @@
               {
                  Map.Entry entry = (Map.Entry) itr.next();
                  String listenerId = (String) entry.getKey();
  -               String prefix = listenerId.substring(0, listenerId.indexOf('+'));
  +               int index = listenerId.indexOf('+');
  +               String prefix = listenerId.substring(0, index);
                  if (!sessionId.equals(prefix))
                     continue;
  +               if (index >= 0)
  +                  listenerId = listenerId.substring(index + 1);
                  CallbackHandlerHolder holder = (CallbackHandlerHolder) entry.getValue();
                  InvokerCallbackHandler holderHandler = holder.getHandler();
                  if(holderHandler.equals(handler))
  @@ -195,7 +201,9 @@
               {
                  for(int x = 0; x < holderList.size(); x++)
                  {
  -                  localServerLocators.remove(((CallbackLocatorHolder)holderList.get(x)).getListenerId());
  +                  String listenerId = ((CallbackLocatorHolder)holderList.get(x)).getListenerId();
  +                  String key = sessionId + "+" + listenerId;
  +                  localServerLocators.remove(key);
                  }
               }
            }
  @@ -305,7 +313,35 @@
            }
         }
   
  -      return factory;
  +      return wrapSocketFactory(factory, configuration);
  +   }
  +   
  +   
  +   static public SocketFactory wrapSocketFactory(SocketFactory socketFactory, Map config)
  +   {
  +      if (config == null)
  +         return socketFactory;
  +      
  +      Object o = config.get(Remoting.SOCKET_CREATION_LISTENER);
  +      if (o != null && o instanceof SocketCreationListener)
  +      {
  +         SocketCreationListener listener = (SocketCreationListener) o;
  +         return new CreationListenerSocketFactory(socketFactory, listener);
  +      }
  +      
  +      return socketFactory;
  +   }
  +   
  +   
  +   static public boolean isCompleteSocketFactory(SocketFactory sf)
  +   {
  +      if (sf != null)
  +      {
  +         if (!(sf instanceof SocketFactoryWrapper) ||
  +             ((SocketFactoryWrapper)sf).getSocketFactory() != null)
  +            return true;
  +      }
  +      return false;
      }