Backport fix for handling of multiple query parameters of the same name

hyperic · Jan 9, 2010 · 58891a7 · 58891a7
1 parent 3d525c0
commit 58891a7
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/org/hyperic/hq/hqapi1/HQConnection.java b/src/org/hyperic/hq/hqapi1/HQConnection.java
@@ -118,16 +118,16 @@ <T> T doGet(String path, Map<String, String[]> params, Class<T> resultClass)
             uri.append("?");
         }
 
-        int idx = 0;
-        for (Iterator i = params.keySet().iterator(); i.hasNext(); idx++) {
-            String key = (String)i.next();
-            String[] vals = params.get(key);
-            for (String val : vals) {
+        boolean append = false;
+
+        for (Map.Entry<String,String[]> e : params.entrySet()) {
+            for (String val : e.getValue()) {
                 if (val != null) {
-                    if (idx > 0) {
+                    if (append) {
                         uri.append("&");
                     }
-                    uri.append(key).append("=").append(urlEncode(val));
+                    uri.append(e.getKey()).append("=").append(urlEncode(val));
+                    append = true;
                 }
             }
         }