12:18 a.m.
Author: ron.sigal(a)jboss.com
Date: 2014-12-09 01:18:54 -0500 (Tue, 09 Dec 2014)
New Revision: 6529
Modified:
remoting2/branches/2.5.4.SP3-01190444/src/main/org/jboss/remoting/ConnectionValidator.java
remoting2/branches/2.5.4.SP3-01190444/src/main/org/jboss/remoting/Lease.java
remoting2/branches/2.5.4.SP3-01190444/src/main/org/jboss/remoting/LeasePinger.java
remoting2/branches/2.5.4.SP3-01190444/src/main/org/jboss/remoting/MicroRemoteClientInvoker.java
remoting2/branches/2.5.4.SP3-01190444/src/main/org/jboss/remoting/ServerInvoker.java
remoting2/branches/2.5.4.SP3-01190444/src/main/org/jboss/remoting/Version.java
Log:
Cleaned up System.out.println() and log.info() calls.
Modified:
remoting2/branches/2.5.4.SP3-01190444/src/main/org/jboss/remoting/ConnectionValidator.java
===================================================================
---
remoting2/branches/2.5.4.SP3-01190444/src/main/org/jboss/remoting/ConnectionValidator.java 2014-11-20
06:08:05 UTC (rev 6528)
+++
remoting2/branches/2.5.4.SP3-01190444/src/main/org/jboss/remoting/ConnectionValidator.java 2014-12-09
06:18:54 UTC (rev 6529)
@@ -360,7 +360,7 @@
{
isValid = false;
- log.info(this + ": tieToLease: " + tieToLease + ", client
lease period: " + client.getLeasePeriod());
+ log.trace(this + ": tieToLease: " + tieToLease + ", client
lease period: " + client.getLeasePeriod());
// if (tieToLease && client.getLeasePeriod() > 0)
if (tieToLease && clientLeasePeriod > 0)
{
@@ -469,9 +469,9 @@
if (s.size() == 0)
{
listeners.remove(listener);
- log.info(this + " removed " + listener);
+ log.debug(this + " removed " + listener);
}
- log.info(this + " listeners.size(): " + listeners.size());
+ log.trace(this + " listeners.size(): " + listeners.size());
if (listeners.size() == 0)
{
stop();
@@ -677,7 +677,7 @@
try
{
tieToLease = Boolean.valueOf(((String) o)).booleanValue();
- log.info(this + " tieToLease: " + tieToLease);
+ log.trace(this + " tieToLease: " + tieToLease);
}
catch (Exception e)
{
Modified: remoting2/branches/2.5.4.SP3-01190444/src/main/org/jboss/remoting/Lease.java
===================================================================
---
remoting2/branches/2.5.4.SP3-01190444/src/main/org/jboss/remoting/Lease.java 2014-11-20
06:08:05 UTC (rev 6528)
+++
remoting2/branches/2.5.4.SP3-01190444/src/main/org/jboss/remoting/Lease.java 2014-12-09
06:18:54 UTC (rev 6529)
@@ -87,7 +87,7 @@
}
this.leaseWindow = leasePeriod * 2;
this.clientLeases = clientLeases;
- log.info("clientLeases: " + clientLeases);
+ log.trace("clientLeases: " + clientLeases);
}
Modified:
remoting2/branches/2.5.4.SP3-01190444/src/main/org/jboss/remoting/LeasePinger.java
===================================================================
---
remoting2/branches/2.5.4.SP3-01190444/src/main/org/jboss/remoting/LeasePinger.java 2014-11-20
06:08:05 UTC (rev 6528)
+++
remoting2/branches/2.5.4.SP3-01190444/src/main/org/jboss/remoting/LeasePinger.java 2014-12-09
06:18:54 UTC (rev 6529)
@@ -321,7 +321,7 @@
public long getLeasePeriod(String sessionID)
{
- log.info(this + ": timerTask: " + timerTask + ",
clientSessionIds.containsKey(sessionID): " +
clientSessionIds.containsKey(sessionID));
+ log.trace(this + ": timerTask: " + timerTask + ",
clientSessionIds.containsKey(sessionID): " +
clientSessionIds.containsKey(sessionID));
if (timerTask == null)
{
return -1;
Modified:
remoting2/branches/2.5.4.SP3-01190444/src/main/org/jboss/remoting/MicroRemoteClientInvoker.java
===================================================================
---
remoting2/branches/2.5.4.SP3-01190444/src/main/org/jboss/remoting/MicroRemoteClientInvoker.java 2014-11-20
06:08:05 UTC (rev 6528)
+++
remoting2/branches/2.5.4.SP3-01190444/src/main/org/jboss/remoting/MicroRemoteClientInvoker.java 2014-12-09
06:18:54 UTC (rev 6529)
@@ -472,7 +472,7 @@
{
synchronized(clientLeaseLock)
{
- log.info(this + ": leasePinger: " + leasePinger);
+ log.trace(this + ": leasePinger: " + leasePinger);
if(leasePinger == null)
{
return -1;
Modified:
remoting2/branches/2.5.4.SP3-01190444/src/main/org/jboss/remoting/ServerInvoker.java
===================================================================
---
remoting2/branches/2.5.4.SP3-01190444/src/main/org/jboss/remoting/ServerInvoker.java 2014-11-20
06:08:05 UTC (rev 6528)
+++
remoting2/branches/2.5.4.SP3-01190444/src/main/org/jboss/remoting/ServerInvoker.java 2014-12-09
06:18:54 UTC (rev 6529)
@@ -449,7 +449,7 @@
public void removeConnectionListener(ConnectionListener listener)
{
- System.out.println(this + " removing ConnecttionListener " + listener);
+ log.trace(this + " removing ConnecttionListener " + listener);
if(connectionNotifier != null)
{
connectionNotifier.removeListener(listener);
@@ -467,7 +467,7 @@
String sessionId = (String)itr.next();
Lease clientLease = (Lease)clientLeases.get(sessionId);
clientLease.terminateLease(sessionId);
- System.out.println(this + " terminating " + clientLease);
+ log.trace(this + " terminating " + clientLease);
}
clientLeases.clear();
}
@@ -2066,13 +2066,16 @@
}
if(clientSessionId != null)
{
- if(trace) { log.trace("Getting lease for invoker session id: " +
clientSessionId); }
- System.out.println(this + ": existing leases:");
- Iterator it = clientLeases.keySet().iterator();
- while (it.hasNext())
- {
- Object key = it.next();
- log.info(" " + clientLeases.get(key));
+ if(trace)
+ {
+ log.trace(this + ": Getting lease for invoker session id: " +
clientSessionId);
+ log.trace(this + ": existing leases:");
+ Iterator it = clientLeases.keySet().iterator();
+ while (it.hasNext())
+ {
+ Object key = it.next();
+ log.trace(" " + clientLeases.get(key));
+ }
}
Lease clientLease = null;
@@ -2114,7 +2117,7 @@
if (trace) log.trace("terminating invoker lease: " +
clientLease);
clientLease.terminateLeaseUponFailure(clientSessionId);
clientLeases.remove(clientSessionId);
-log.info(this + " clientLeases: " + clientLeases);
+ log.trace(this + " clientLeases: " + clientLeases);
Lease newClientLease = new Lease(clientSessionId, leasePeriod,
locator.getLocatorURI(),
invocation.getRequestPayload(),
Modified: remoting2/branches/2.5.4.SP3-01190444/src/main/org/jboss/remoting/Version.java
===================================================================
---
remoting2/branches/2.5.4.SP3-01190444/src/main/org/jboss/remoting/Version.java 2014-11-20
06:08:05 UTC (rev 6528)
+++
remoting2/branches/2.5.4.SP3-01190444/src/main/org/jboss/remoting/Version.java 2014-12-09
06:18:54 UTC (rev 6529)
@@ -40,7 +40,7 @@
public static final byte VERSION_2 = 2;
public static final byte VERSION_2_2 = 22;
- public static final String VERSION = "2.5.4.SP3-0119044 (Flounder) [01190444:
11/6/14: 01:39";
+ public static final String VERSION = "2.5.4.SP3-0119044 (Flounder) [01190444:
12/09/14: 01:56";
private static final byte byteVersion = VERSION_2_2;
private static byte defaultByteVersion = byteVersion;
private static boolean performVersioning = true;