349344 Passing empty query string to UrlEncoded#decodeTo(String, MultiMap, String) does not yield an empty map

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3390 7e9141cc-0065-0410-87d8-b60c137991c4

3 files changed, 10 insertions, 2 deletions

diff --git a/VERSION.txt b/VERSION.txt
index 429c60afa6..c924986c78 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -3,6 +3,7 @@ jetty-7.4.3-SNAPSHOT
  + 347617 Dynamically install/update/remove OSGi bundles discovered in the contexts folder
  + 347717 start.jar destroys dependent child of --exec
  + 347898 Close channel on JVM exceptions
+ + 349344 Passing empty query string to UrlEncoded#decodeTo(String, MultiMap, String) does not yield an empty map
  + JETTY-1342 Recreate selector in change task
  + 347889 OSGi should follow directive visibility:=reexport for META-INF/web-fragments and resources 
 
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/UrlEncoded.java b/jetty-util/src/main/java/org/eclipse/jetty/util/UrlEncoded.java
index ba0fd87a93..a6f397dc60 100644
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/UrlEncoded.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/UrlEncoded.java
@@ -231,7 +231,10 @@ public class UrlEncoded extends MultiMap
                 key = encoded
                     ?decodeString(content,mark+1,content.length()-mark-1,charset)
                     :content.substring(mark+1);
-                map.add(key,"");
+                if (key != null && key.length() > 0)
+                {
+                    map.add(key,"");
+                }
             }
         }
     }
diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/URLEncodedTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/URLEncodedTest.java
index ac8866b62b..2e25a7af90 100644
--- a/jetty-util/src/test/java/org/eclipse/jetty/util/URLEncodedTest.java
+++ b/jetty-util/src/test/java/org/eclipse/jetty/util/URLEncodedTest.java
@@ -34,7 +34,11 @@ public class URLEncodedTest
     {
           
         UrlEncoded url_encoded = new UrlEncoded();
-        assertEquals("Empty",0, url_encoded.size());
+        assertEquals("Initially not empty",0, url_encoded.size());
+        
+        url_encoded.clear();
+        url_encoded.decode("");
+        assertEquals("Not empty after decode(\"\")",0, url_encoded.size());
 
         url_encoded.clear();
         url_encoded.decode("Name1=Value1");