diff src/org/eclipse/jetty/util/UrlEncoded.java @ 820:8e9db0bbf4f9

remove org.eclipse.jetty.util.log and upgrade slf4j
author Franklin Schmidt <fschmidt@gmail.com>
date Tue, 13 Sep 2016 23:13:06 -0600
parents 3428c60d7cfc
children 9d357b9e4bcb
line wrap: on
line diff
--- a/src/org/eclipse/jetty/util/UrlEncoded.java	Fri Sep 09 17:10:47 2016 -0600
+++ b/src/org/eclipse/jetty/util/UrlEncoded.java	Tue Sep 13 23:13:06 2016 -0600
@@ -29,8 +29,8 @@
 import java.util.Map;
 
 import org.eclipse.jetty.util.Utf8Appendable.NotUtf8Exception;
-import org.eclipse.jetty.util.log.Log;
-import org.eclipse.jetty.util.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /* ------------------------------------------------------------ */
 /** Handles coding of MIME  "x-www-form-urlencoded".
@@ -53,7 +53,7 @@
  */
 public class UrlEncoded extends MultiMap implements Cloneable
 {
-    private static final Logger LOG = Log.getLogger(UrlEncoded.class);
+    private static final Logger LOG = LoggerFactory.getLogger(UrlEncoded.class);
 
     public static final String ENCODING = System.getProperty("org.eclipse.jetty.util.UrlEncoding.charset",StringUtil.__UTF8);
 
@@ -360,7 +360,7 @@
                 catch(NotUtf8Exception e)
                 {
                     LOG.warn(e.toString());
-                    LOG.debug(e);
+                    LOG.debug("",e);
                 }
             }
             
@@ -564,7 +564,7 @@
                 catch(NotUtf8Exception e)
                 {
                     LOG.warn(e.toString());
-                    LOG.debug(e);
+                    LOG.debug("",e);
                 }
                 if (maxLength>=0 && (++totalLength > maxLength))
                     throw new IllegalStateException("Form too large");
@@ -789,11 +789,11 @@
                         catch(NotUtf8Exception e)
                         {
                             LOG.warn(e.toString());
-                            LOG.debug(e);
+                            LOG.debug("",e);
                         }
                         catch(NumberFormatException nfe)
                         {
-                            LOG.debug(nfe);
+                            LOG.debug("",nfe);
                             buffer.getStringBuffer().append(Utf8Appendable.REPLACEMENT);  
                         }
                     }
@@ -890,7 +890,7 @@
                                     }
                                     catch(NumberFormatException nfe)
                                     {   
-                                        LOG.ignore(nfe);
+                                        LOG.trace("",nfe);
                                         ba[n++] = (byte)'?';
                                     }
                                 }