[java-centralized-discovery COMMIT] /branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/wayf/DiscoveryS...

[noreply at shibboleth.net]

Author: rdw
Date: Wed Mar  7 15:14:31 2012
New Revision: 2207

URL: http://svn.shibboleth.net/view/java-centralized-discovery?rev=2207&view=rev
Log:
SDSJ-103 remove spurious extra decode of the returnURL

Modified:
    branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.java

Modified: branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.java
URL: http://svn.shibboleth.net/view/java-centralized-discovery/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.java?rev=2207&r1=2206&r2=2207&view=diff
==============================================================================
--- branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.java (original)
+++ branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.java Wed Mar  7 15:14:31 2012
@@ -21,7 +21,6 @@
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -841,11 +840,10 @@
             if (null == returnUrl || 0 == returnUrl.length()) {
                 throw new WayfException("Could not find return parameter");
             }
-            try {
-                returnUrl = URLDecoder.decode(returnUrl, "UTF-8");
-            } catch (UnsupportedEncodingException e) {
-                throw new WayfException("Did not understand parameter ", e);
-            }
+            //
+            // Do *NOT* decode the return URL here. It is just as we like it
+            //
+
             String redirect;
             if (site != null) {
                 StringBuffer buffer = new StringBuffer(returnUrl);