From: fhanik Date: Tue, 18 Nov 2008 03:18:30 +0000 (+0000) Subject: Clean up debug a bit while troubleshooting X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=b372454f7bab6e780f7c8117125c7f148ab97db7;p=tomcat7.0 Clean up debug a bit while troubleshooting git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@718474 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java index 23e1ad88d..2df37482d 100644 --- a/java/org/apache/tomcat/util/net/NioEndpoint.java +++ b/java/org/apache/tomcat/util/net/NioEndpoint.java @@ -1690,7 +1690,7 @@ public class NioEndpoint { cancelledKey(key, SocketStatus.ERROR,false); } }//for - if ( log.isDebugEnabled() ) log.debug("timeout completed: keys processed="+keycount+"; now="+now+"; nextExpiration="+prevExp+"; "+ + if ( log.isTraceEnabled() ) log.trace("timeout completed: keys processed="+keycount+"; now="+now+"; nextExpiration="+prevExp+"; "+ "keyCount="+keyCount+"; hasEvents="+hasEvents +"; eval="+( (now < prevExp) && (keyCount>0 || hasEvents) && (!close) )); } diff --git a/java/org/apache/tomcat/util/net/SecureNioChannel.java b/java/org/apache/tomcat/util/net/SecureNioChannel.java index 852996266..462aa5f01 100644 --- a/java/org/apache/tomcat/util/net/SecureNioChannel.java +++ b/java/org/apache/tomcat/util/net/SecureNioChannel.java @@ -471,5 +471,25 @@ public class SecureNioChannel extends NioChannel { public SocketChannel getIOChannel() { return sc; } + + public String toString() { + StringBuffer buf = new StringBuffer("["); + buf.append(super.toString()); + buf.append("] "); + buf.append("Netout buffer: pos="+this.netOutBuffer.position()); + buf.append(" limit="+this.netOutBuffer.limit()); + buf.append(" Remaining:"+this.netOutBuffer.remaining()); + buf.append("; Netin buffer: pos="+this.netInBuffer.position()); + buf.append(" limit="+this.netInBuffer.limit()); + buf.append(" Remaining:"+this.netInBuffer.remaining()); + buf.append("; Appin buffer: pos="+this.bufHandler.getReadBuffer().position()); + buf.append(" limit="+this.bufHandler.getReadBuffer().limit()); + buf.append(" Remaining:"+this.bufHandler.getReadBuffer().remaining()); + buf.append("; Appout buffer: pos="+this.bufHandler.getWriteBuffer().position()); + buf.append(" limit="+this.bufHandler.getWriteBuffer().limit()); + buf.append(" Remaining:"+this.bufHandler.getWriteBuffer().remaining()); + return buf.toString(); + } + } \ No newline at end of file