svn commit: r594257 - in /wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/portlet: PortletActionServletResponseWrapper.java PortletServletResponseWrapper.java

[ate]

Author: ate
Date: Mon Nov 12 11:05:50 2007
New Revision: 594257

URL: http://svn.apache.org/viewvc?rev=594257&view=rev
Log:
WICKET-1155: WebResponse.redirect(url) calls response.encodeRedirect(url) which 
is formally not supported on JSR-168 and thus can result in a NPE
See: http://issues.apache.org/jira/browse/WICKET-1155

Modified:
    
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/portlet/PortletActionServletResponseWrapper.java
    
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/portlet/PortletServletResponseWrapper.java

Modified: 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/portlet/PortletActionServletResponseWrapper.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/portlet/PortletActionServletResponseWrapper.java?rev=594257&r1=594256&r2=594257&view=diff
==============================================================================
--- 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/portlet/PortletActionServletResponseWrapper.java
 (original)
+++ 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/portlet/PortletActionServletResponseWrapper.java
 Mon Nov 12 11:05:50 2007
@@ -52,16 +52,6 @@
        {
        }
 
-       public String encodeRedirectUrl(String s)
-       {
-               return s;
-       }
-
-       public String encodeRedirectURL(String s)
-       {
-               return s;
-       }
-
        public String encodeUrl(String s)
        {
                return s;

Modified: 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/portlet/PortletServletResponseWrapper.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/portlet/PortletServletResponseWrapper.java?rev=594257&r1=594256&r2=594257&view=diff
==============================================================================
--- 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/portlet/PortletServletResponseWrapper.java
 (original)
+++ 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/portlet/PortletServletResponseWrapper.java
 Mon Nov 12 11:05:50 2007
@@ -68,4 +68,16 @@
        {
                responseState.setStatusCode(statusCode);
        }
+
+       public String encodeRedirectUrl(String url)
+       {
+               String s = super.encodeRedirectUrl(url);
+               return s != null ? s : url;
+       }
+
+       public String encodeRedirectURL(String url)
+       {
+               String s = super.encodeRedirectURL(url);
+               return s != null ? s : url;
+       }
 }