[Yanel-commits] rev 50865 - public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet

[michi at wyona.com]

Author: michi
Date: 2010-07-01 14:41:42 +0200 (Thu, 01 Jul 2010)
New Revision: 50865

Modified:
   public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/AccessLog.java
Log:
catch null

Modified: public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/AccessLog.java
===================================================================
--- public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/AccessLog.java	2010-07-01 12:35:42 UTC (rev 50864)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/AccessLog.java	2010-07-01 12:41:42 UTC (rev 50865)
@@ -53,16 +53,17 @@
      * @param value Value of the field
      */
     public static String encodeLogField(String field, String value) {
-        String result;
-        
         try {
-            result = field + ":" + URLEncoder.encode(value, LOG_ENCODING) + " ";
+            if (value != null) {
+                return field + ":" + URLEncoder.encode(value, LOG_ENCODING) + " ";
+            } else {
+                log.warn("Value of field '" + field + "' is null!");
+                return field + ":" + value + " ";
+            }
         } catch(UnsupportedEncodingException e) {
-            // Fall back to default encoding
-            result = field + ":" + URLEncoder.encode(value) + " ";
+            log.warn("Fall back to default encoding");
+            return field + ":" + URLEncoder.encode(value) + " ";
         }
-
-        return result;
     }
 
     /**