commit 482e30045a43b2255e2c72cadc25ad484a75d382
author Joakim Erdfelt <joakim.erdfelt@gmail.com> Mon Nov 23 14:29:55 2015 -0700
committer Joakim Erdfelt <joakim.erdfelt@gmail.com> Mon Nov 23 14:29:55 2015 -0700
tree 579a95eba9874016cea7d000910e0ddee67447dc
parent cda95e1f17eaf3195859b84504abb48fcaa85345

482172 - Report form key size count in UrlEncoded exceptions

+ Fixing ISE message format/syntax

jetty-util/src/main/java/org/eclipse/jetty/util/UrlEncoded.java

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 e776c9a..f6c3419 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
@@ -453,7 +453,7 @@
                         key = null;
                         value=null;
                         if (maxKeys>0 && map.size()>maxKeys)
-                            throw new IllegalStateException("Form too many keys");
+                            throw new IllegalStateException(String.format("Form with too many keys [%d > %d]",map.size(),maxKeys));
                         break;
                         
                     case '=':
@@ -499,7 +499,7 @@
                     break;
                 }
                 if (maxLength>=0 && (++totalLength > maxLength))
-                    throw new IllegalStateException("Form too large");
+                    throw new IllegalStateException(String.format("Form with too many keys [%d > %d]",map.size(),maxKeys));
             }
             
             if (key != null)
@@ -555,7 +555,7 @@
                             key = null;
                             value=null;
                             if (maxKeys>0 && map.size()>maxKeys)
-                                throw new IllegalStateException("Form too many keys");
+                                throw new IllegalStateException(String.format("Form with too many keys [%d > %d]",map.size(),maxKeys));
                             break;
 
                         case '=':
@@ -629,7 +629,7 @@
                     LOG.debug(e);
                 }
                 if (maxLength>=0 && (++totalLength > maxLength))
-                    throw new IllegalStateException("Form too large");
+                    throw new IllegalStateException(String.format("Form with too many keys [%d > %d]",map.size(),maxKeys));
             }
             
             if (key != null)
@@ -751,7 +751,7 @@
                             key = null;
                             value=null;
                             if (maxKeys>0 && map.size()>maxKeys)
-                                throw new IllegalStateException("Form too many keys");
+                                throw new IllegalStateException(String.format("Form with too many keys [%d > %d]",map.size(),maxKeys));
                             break;
                         case '=':
                             if (key!=null)
@@ -797,7 +797,7 @@
 
                     totalLength++;
                     if (maxLength>=0 && totalLength > maxLength)
-                        throw new IllegalStateException("Form too large");
+                        throw new IllegalStateException(String.format("Form with too many keys [%d > %d]",map.size(),maxKeys));
                 }
 
                 size=output.size();