On 12/07/2012 11:48, Rainer Jung wrote: > On 12.07.2012 12:30, ma...@apache.org wrote: >> Author: markt >> Date: Thu Jul 12 10:30:44 2012 >> New Revision: 1360618 >> >> URL: http://svn.apache.org/viewvc?rev=1360618&view=rev >> Log: >> Clean up debug logging >> >> Modified: >> tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java >> tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocketContext.java >> >> Modified: tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java >> URL: >> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java?rev=1360618&r1=1360617&r2=1360618&view=diff >> >> ============================================================================== >> >> --- tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java >> (original) >> +++ tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java Thu >> Jul 12 10:30:44 2012 >> @@ -56,9 +56,10 @@ import org.apache.tomcat.jni.socket.AprS >> */ >> public class AprSocket implements Runnable { >> >> - static final byte[][] NO_CERTS = new byte[0][]; >> + private static final Logger log = >> + Logger.getLogger("org.apache.tomcat.jni.socket.AprSocket"); >> >> - static Logger log = Logger.getLogger("AprSocket"); >> + static final byte[][] NO_CERTS = new byte[0][]; >> >> static int CONNECTING = 1; >> static int CONNECTED = 0x2; >> @@ -280,7 +281,7 @@ public class AprSocket implements Runnab >> updatePolling(); >> return rt; >> } >> - if (context.debug) { >> + if (log.isLoggable(Level.WARNING)) { > > debug && warning replaced by unconditional WARNING? > In all other cases you changed debug && info to FINE.
Since the check and the log level were inconsistent, I had to go one way or the other. If I made the wrong choice we can always reduce the log level later. There is also no need for the level check here either. I'll remove it. Cheers, Mark --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
