svn commit: r1196687 - in /wicket/trunk/wicket-request/src: main/java/org/apache/wicket/request/UrlEncoder.java test/java/org/apache/wicket/request/UrlTest.java

[iv...@apache.org]

Author: ivaynberg
Date: Wed Nov  2 17:01:01 2011
New Revision: 1196687

URL: http://svn.apache.org/viewvc?rev=1196687&view=rev
Log:
encode ? in query string parameters because if we do not it breaks portlet environments.
Issue: WICKET-4019

Modified:
    wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlEncoder.java
    wicket/trunk/wicket-request/src/test/java/org/apache/wicket/request/UrlTest.java

Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlEncoder.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlEncoder.java?rev=1196687&r1=1196686&r2=1196687&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlEncoder.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlEncoder.java Wed Nov  2 17:01:01 2011
@@ -197,8 +197,17 @@ public class UrlEncoder
 				dontNeedEncoding.set(' ');
 				// to allow direct passing of URL in query
 				dontNeedEncoding.set('/');
+
+				/*
+				 * the below encoding of a ? is disabled because it interferes in portlet
+				 * environments. as far as i can tell it will not interfere with the ability to pass
+				 * around urls in the query string. however, should it cause problems we can
+				 * re-enable it as portlet environments are not high priority. we can also add a
+				 * switch somewhere to enable/disable this on applicaiton level. (WICKET-4019)
+				 */
+
 				// to allow direct passing of URL in query
-				dontNeedEncoding.set('?');
+				// dontNeedEncoding.set('?');
 				break;
 
 			// this added to deal with encoding a PATH component

Modified: wicket/trunk/wicket-request/src/test/java/org/apache/wicket/request/UrlTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/test/java/org/apache/wicket/request/UrlTest.java?rev=1196687&r1=1196686&r2=1196687&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/test/java/org/apache/wicket/request/UrlTest.java (original)
+++ wicket/trunk/wicket-request/src/test/java/org/apache/wicket/request/UrlTest.java Wed Nov  2 17:01:01 2011
@@ -168,7 +168,7 @@ public class UrlTest extends TestCase
 		url.setQueryParameter("a", "b");
 		url.setQueryParameter("x?&4", "y=z");
 
-		assertEquals("foo/b=r/b&z/x%3F?a=b&x?%264=y%3Dz", url.toString());
+		assertEquals("foo/b=r/b&z/x%3F?a=b&x%3F%264=y%3Dz", url.toString());
 	}
 
 	/**