[Mulgara-svn] r1992 - trunk/src/jar/util/java/org/mulgara/util

[pag at mulgara.org]

Author: pag
Date: 2011-02-03 20:45:35 +0000 (Thu, 03 Feb 2011)
New Revision: 1992

Modified:
   trunk/src/jar/util/java/org/mulgara/util/JettyLogger.java
Log:
Updated Jetty logging to deal with URIs better, particularly URIs with spaces

Modified: trunk/src/jar/util/java/org/mulgara/util/JettyLogger.java
===================================================================
--- trunk/src/jar/util/java/org/mulgara/util/JettyLogger.java	2010-12-07 04:36:18 UTC (rev 1991)
+++ trunk/src/jar/util/java/org/mulgara/util/JettyLogger.java	2011-02-03 20:45:35 UTC (rev 1992)
@@ -16,6 +16,7 @@
 
 package org.mulgara.util;
 
+import java.util.Arrays;
 import org.eclipse.jetty.util.log.Logger;
 
 /**
@@ -190,6 +191,20 @@
     return msg;
   }
 
+  /**
+   * Duplicate the operation of String.format, but replace URI spaces with an escaped version.
+   * Falls back to an unformated version on failure.
+   * @param arg0 The format string.
+   * @param arg1 The parameters to put into the formatted string.
+   * @return A formatted string.
+   */
+  private String format(String arg0, Object... arg1) {
+    try {
+      return String.format(arg0.replace("%20", "%%20"), arg1);
+    } catch (Exception e) {
+      return "Unformatted log: " + arg0 + " : " + Arrays.asList(arg1);
+    }
+  }
 
   @Override
   public void debug(Throwable msg) {
@@ -199,7 +214,7 @@
 
   @Override
   public void debug(String arg0, Object... arg1) {
-    if (enabled && debugEnabled) log.debug(String.format(arg0, arg1));
+    if (enabled && debugEnabled) log.debug(format(arg0, arg1));
   }
 
 
@@ -217,7 +232,7 @@
 
   @Override
   public void info(String arg0, Object... arg1) {
-    if (enabled) log.info(String.format(arg0, arg1));
+    if (enabled) log.info(format(arg0, arg1));
   }
 
 
@@ -235,6 +250,6 @@
 
   @Override
   public void warn(String arg0, Object... arg1) {
-    if (enabled) log.warn(String.format(arg0, arg1));
+    if (enabled) log.warn(format(arg0, arg1));
   }
 }