[OFBiz] SVN: r4974 - trunk/base/src/base/org/ofbiz/base/util

[jonesde at svn.ofbiz.org]

Author: jonesde
Date: 2005-05-09 18:29:00 -0500 (Mon, 09 May 2005)
New Revision: 4974

Modified:
   trunk/base/src/base/org/ofbiz/base/util/UtilHttp.java
   trunk/base/src/base/org/ofbiz/base/util/UtilMisc.java
   trunk/base/src/base/org/ofbiz/base/util/UtilProperties.java
Log:
Some log message improvments; will now show parameter map contents in verbose mode; will now only show message about missing properties file once as in normal operation this can happen frequently

Modified: trunk/base/src/base/org/ofbiz/base/util/UtilHttp.java
===================================================================
--- trunk/base/src/base/org/ofbiz/base/util/UtilHttp.java	2005-05-09 23:27:29 UTC (rev 4973)
+++ trunk/base/src/base/org/ofbiz/base/util/UtilHttp.java	2005-05-09 23:29:00 UTC (rev 4974)
@@ -33,13 +33,22 @@
 import java.net.FileNameMap;
 import java.net.URLConnection;
 import java.net.URLEncoder;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Currency;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.StringTokenizer;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
-import org.apache.commons.collections.map.LinkedMap;
+import javolution.util.FastMap;
 
 /**
  * HttpUtil - Misc TTP Utility Functions
@@ -58,7 +67,7 @@
      * @return The resulting Map
      */
     public static Map getParameterMap(HttpServletRequest request) {
-        Map paramMap = new LinkedMap();
+        Map paramMap = FastMap.newInstance();
         // first add in all path info parameters /~name1=value1/~name2=value2/
         String pathInfoStr = request.getPathInfo();
 
@@ -102,6 +111,17 @@
                 paramMap.putAll(multiPartMap);
             }
         }
+        
+        //Debug.logInfo("Made parameterMap: \n" + UtilMisc.printMap(paramMap), module);
+        if (Debug.verboseOn()) {
+            Debug.logVerbose("Made Request Parameter Map with [" + paramMap.size() + "] Entries", module);
+            Iterator entryIter = paramMap.entrySet().iterator();
+            while (entryIter.hasNext()) {
+                Map.Entry entry = (Map.Entry) entryIter.next();
+                Debug.logVerbose("Request Parameter Map Entry: [" + entry.getKey() + "] --> " + entry.getValue(), module);
+            }
+        }
+        
         return paramMap;
     }
 

Modified: trunk/base/src/base/org/ofbiz/base/util/UtilMisc.java
===================================================================
--- trunk/base/src/base/org/ofbiz/base/util/UtilMisc.java	2005-05-09 23:27:29 UTC (rev 4973)
+++ trunk/base/src/base/org/ofbiz/base/util/UtilMisc.java	2005-05-09 23:29:00 UTC (rev 4974)
@@ -168,6 +168,19 @@
         return map;
     }
 
+    public static String printMap(Map theMap) {
+        StringBuffer theBuf = new StringBuffer();
+        Iterator entryIter = theMap.entrySet().iterator();
+        while (entryIter.hasNext()) {
+            Map.Entry entry = (Map.Entry) entryIter.next();
+            theBuf.append(entry.getKey());
+            theBuf.append(" --> ");
+            theBuf.append(entry.getValue());
+            theBuf.append("\n");
+        }
+        return theBuf.toString();
+    }
+    
     /**
      * Sort a List of Maps by specified consistent keys.
      * @param listOfMaps List of Map objects to sort.

Modified: trunk/base/src/base/org/ofbiz/base/util/UtilProperties.java
===================================================================
--- trunk/base/src/base/org/ofbiz/base/util/UtilProperties.java	2005-05-09 23:27:29 UTC (rev 4973)
+++ trunk/base/src/base/org/ofbiz/base/util/UtilProperties.java	2005-05-09 23:29:00 UTC (rev 4974)
@@ -31,10 +31,13 @@
 import java.util.MissingResourceException;
 import java.util.Properties;
 import java.util.ResourceBundle;
+import java.util.Set;
 import java.io.FileOutputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 
+import javolution.util.FastSet;
+
 import org.ofbiz.base.util.collections.FlexibleProperties;
 import org.ofbiz.base.util.collections.ResourceBundleMapWrapper;
 import org.ofbiz.base.util.string.FlexibleStringExpander;
@@ -519,6 +522,7 @@
         return bundleMap;
     }
 
+    protected static Set resourceNotFoundMessagesShown = FastSet.newInstance();
     protected static ResourceBundle getBaseResourceBundle(String resource, Locale locale) {
         if (resource == null || resource.length() <= 0) return null;
         if (locale == null) locale = Locale.getDefault();
@@ -528,12 +532,20 @@
         try {
             bundle = ResourceBundle.getBundle(resource, locale, loader);
         } catch (MissingResourceException e) {
-            Debug.log("[UtilProperties.getPropertyValue] could not find resource: " + resource + " for locale " + locale.toString() + ": " + e.toString(), module);
-            return null;
+            String resourceFullName = resource + "_" + locale.toString();
+            if (!resourceNotFoundMessagesShown.contains(resourceFullName)) {
+                resourceNotFoundMessagesShown.add(resourceFullName);
+                Debug.log("[UtilProperties.getPropertyValue] could not find resource: " + resource + " for locale " + locale.toString() + ": " + e.toString(), module);
+                return null;
+            }
         }
         if (bundle == null) {
-            Debug.log("[UtilProperties.getPropertyValue] could not find resource: " + resource + " for locale " + locale.toString(), module);
-            return null;
+            String resourceFullName = resource + "_" + locale.toString();
+            if (!resourceNotFoundMessagesShown.contains(resourceFullName)) {
+                resourceNotFoundMessagesShown.add(resourceFullName);
+                Debug.log("[UtilProperties.getPropertyValue] could not find resource: " + resource + " for locale " + locale.toString(), module);
+                return null;
+            }
         }
 
         return bundle;