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

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

Author: ron.sigal at jboss.com
Date: 2009-05-05 04:22:57 -0400 (Tue, 05 May 2009)
New Revision: 5131

Modified:
   remoting2/branches/2.2.2-SP11_JBREM-1112/src/main/org/jboss/remoting/ConnectionValidator.java
Log:
JBREM-1112 (and others to be named): Calls notifyListeners() if leasePinger == null.

Modified: remoting2/branches/2.2.2-SP11_JBREM-1112/src/main/org/jboss/remoting/ConnectionValidator.java
===================================================================
--- remoting2/branches/2.2.2-SP11_JBREM-1112/src/main/org/jboss/remoting/ConnectionValidator.java	2009-05-05 08:22:05 UTC (rev 5130)
+++ remoting2/branches/2.2.2-SP11_JBREM-1112/src/main/org/jboss/remoting/ConnectionValidator.java	2009-05-05 08:22:57 UTC (rev 5131)
@@ -532,6 +532,7 @@
             leasePinger = sharedInvoker.getLeasePinger();
          }
       }
+      log.debug(this + ": sharedInvoker = " + sharedInvoker + ", leasePinger = " + leasePinger);
    }
    
    private void getParametersFromMap(Map config)
@@ -854,6 +855,7 @@
                {
                   log.debug(ConnectionValidator.this + " shutting down lease pinger: " + leasePinger);
                   int disconnectTimeout = (failureDisconnectTimeout == -1) ? client.getDisconnectTimeout() : failureDisconnectTimeout;
+                  log.debug(ConnectionValidator.this + " disconnectTimeout: " + disconnectTimeout);
                   // MicroRemoteClientInvoker.terminateLease() will call LeasePinger.stopPing(), which will call
                   // Client.disconnectAndNotify() for all Clients with registered ConnectionListeners, and
                   // Client.disconnectAndNotify() will call ConnectionValidator.notifyListeners().
@@ -863,6 +865,7 @@
                {
 //                  log.debug(ConnectionValidator.this + " unable to shut down lease pinger: " + leasePinger + ". Client must have shut down");
                   log.debug(ConnectionValidator.this + " unable to shut down null lease pinger. Client must have shut down");
+                  notifyListeners(new Exception("Could not connect to server!"));
                }
                
                cancel();