From 58891a7c9805ae88a4ffa45320319a7ab4ac567e Mon Sep 17 00:00:00 2001
From: Ryan Morgan <rmorgan@hyperic.com>
Date: Fri, 8 Jan 2010 16:10:30 -0800
Subject: [PATCH] Backport fix for handling of multiple query parameters of the
 same name

---
 src/org/hyperic/hq/hqapi1/HQConnection.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/org/hyperic/hq/hqapi1/HQConnection.java b/src/org/hyperic/hq/hqapi1/HQConnection.java
index dae7581a..4f0164c1 100644
--- 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;
                 }
             }
         }