Clean up the debug logging impl

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@787641 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/tomcat/util/http/Parameters.java b/java/org/apache/tomcat/util/http/Parameters.java
index 2f68d5a..676a5dc 100644 (file)
--- a/java/org/apache/tomcat/util/http/Parameters.java
+++ b/java/org/apache/tomcat/util/http/Parameters.java
@@ -67,12 +67,16 @@ public final class Parameters extends MultiMap {
 
     public void setEncoding( String s ) {
         encoding=s;
-        if(debug>0) log( "Set encoding to " + s );
+        if(log.isDebugEnabled()) {
+            log.debug( "Set encoding to " + s );
+        }
     }
 
     public void setQueryStringEncoding( String s ) {
         queryStringEncoding=s;
-        if(debug>0) log( "Set query string encoding to " + s );
+        if(log.isDebugEnabled()) {
+            log.debug( "Set query string encoding to " + s );
+        }
     }
 
     public void recycle() {
@@ -141,8 +145,10 @@ public final class Parameters extends MultiMap {
         if( queryMB==null || queryMB.isNull() )
             return;
         
-        if( debug > 0  )
-            log( "Decoding query " + decodedQuery + " " + queryStringEncoding);
+        if(log.isDebugEnabled()) {
+            log.debug("Decoding query " + decodedQuery + " " +
+                    queryStringEncoding);
+        }
 
         try {
             decodedQuery.duplicate( queryMB );
@@ -196,8 +202,9 @@ public final class Parameters extends MultiMap {
         int end=start+len;
         int pos=start;
         
-        if( debug>0 ) 
-            log( "Bytes: " + new String( bytes, start, len ));
+        if(log.isDebugEnabled()) { 
+            log.debug("Bytes: " + new String( bytes, start, len ));
+        }
 
         do {
             boolean noEq=false;
@@ -214,7 +221,10 @@ public final class Parameters extends MultiMap {
                 noEq=true;
                 valStart=nameEnd;
                 valEnd=nameEnd;
-                if( debug>0) log("no equal " + nameStart + " " + nameEnd + " " + new String(bytes, nameStart, nameEnd-nameStart) );
+                if(log.isDebugEnabled()) {
+                    log.debug("no equal " + nameStart + " " + nameEnd + " " +
+                            new String(bytes, nameStart, nameEnd-nameStart) );
+                }
             }
             if( nameEnd== -1 ) 
                 nameEnd=end;
@@ -345,10 +355,4 @@ public final class Parameters extends MultiMap {
         return sb.toString();
     }
 
-    private static int debug=0;
-    private void log(String s ) {
-        if (log.isDebugEnabled())
-            log.debug("Parameters: " + s );
-    }
-
 }