[jboss-remoting-commits] JBoss Remoting SVN: r5147 - remoting2/branches/2.2.2-SP11_JBREM-1112/src/main/org/jboss/remoting/callback.

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

Author: ron.sigal at jboss.com
Date: 2009-05-07 00:45:37 -0400 (Thu, 07 May 2009)
New Revision: 5147

Modified:
   remoting2/branches/2.2.2-SP11_JBREM-1112/src/main/org/jboss/remoting/callback/ServerInvokerCallbackHandler.java
Log:
JBREM-1112 (and others to be named): Added shutdown() method.

Modified: remoting2/branches/2.2.2-SP11_JBREM-1112/src/main/org/jboss/remoting/callback/ServerInvokerCallbackHandler.java
===================================================================
--- remoting2/branches/2.2.2-SP11_JBREM-1112/src/main/org/jboss/remoting/callback/ServerInvokerCallbackHandler.java	2009-05-07 04:45:05 UTC (rev 5146)
+++ remoting2/branches/2.2.2-SP11_JBREM-1112/src/main/org/jboss/remoting/callback/ServerInvokerCallbackHandler.java	2009-05-07 04:45:37 UTC (rev 5147)
@@ -80,6 +80,7 @@
 
    private SerializableStore callbackStore = null;
    private CallbackErrorHandler callbackErrorHandler = null;
+   private ServerInvoker serverInvoker;
 
    /**
     * The map key to use when looking up any callback store that
@@ -165,6 +166,7 @@
 
    private void init(InvocationRequest invocation, ServerInvoker owner) throws Exception
    {
+      serverInvoker = owner;
       clientSessionId = invocation.getSessionId();
       sessionId = invocation.getSessionId();
       
@@ -854,7 +856,7 @@
       }
       catch(Throwable t)
       {
-         log.error("Error handling callback", t);
+         log.debug("Error handling callback", t);
          throw new HandleCallbackException("Error handling callback", t);
       }
    }
@@ -1020,12 +1022,19 @@
       }
    }
 
+   public void shutdown()
+   {
+      serverInvoker.shutdownCallbackHandler(this, invocation);
+      destroy();
+      log.debug(this + " shut down");
+   }
+   
    public void handleConnectionException(Throwable throwable, Client client)
    {
       if (clientSessionId.equals(client.getSessionId()))
       {
-         destroy();
-         log.debug(this + " shut down");
+         log.info(this + ".handleConnectionException() got a match: " + client.getSessionId());
+         shutdown();
       }
    }
 }