Author: ron.sigal(a)jboss.com Date: 2009-09-17 14:32:11 -0400 (Thu, 17 Sep 2009) New Revision: 5522 Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/ServerInvoker.java Log: JBREM-1159: updateClientLease() checks if leasePingerID == null. Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/ServerInvoker.java =================================================================== --- remoting2/branches/2.x/src/main/org/jboss/remoting/ServerInvoker.java 2009-09-17 15:02:41 UTC (rev 5521) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/ServerInvoker.java 2009-09-17 18:32:11 UTC (rev 5522) @@ -1990,7 +1990,7 @@ if (useClientConnectionIdentity) { String leasePingerId = (String) invocation.getRequestPayload().get(LeasePinger.LEASE_PINGER_ID);; - if (leasePingerId.equals(clientLease.getLeasePingerId())) + if (leasePingerId == null || leasePingerId.equals(clientLease.getLeasePingerId())) { // including request payload from invocation as may contain updated list of clients. if (trace) log.trace(clientLease + " matches: leasePingerId: " + leasePingerId);