svn commit: r720219 - /wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/CryptedUrlWebRequestCodingStrategy.java

[jcompagner]

Author: jcompagner
Date: Mon Nov 24 08:23:03 2008
New Revision: 720219

URL: http://svn.apache.org/viewvc?rev=720219&view=rev
Log:
merge from 1.3

Modified:
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/CryptedUrlWebRequestCodingStrategy.java

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/CryptedUrlWebRequestCodingStrategy.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/CryptedUrlWebRequestCodingStrategy.java?rev=720219&r1=720218&r2=720219&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/CryptedUrlWebRequestCodingStrategy.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/CryptedUrlWebRequestCodingStrategy.java
 Mon Nov 24 08:23:03 2008
@@ -26,6 +26,7 @@
 import org.apache.wicket.Request;
 import org.apache.wicket.RequestCycle;
 import org.apache.wicket.WicketRuntimeException;
+import org.apache.wicket.protocol.http.PageExpiredException;
 import org.apache.wicket.protocol.http.RequestUtils;
 import org.apache.wicket.protocol.http.WicketURLDecoder;
 import org.apache.wicket.protocol.http.WicketURLEncoder;
@@ -274,15 +275,15 @@
         * @return decoded URL
         * @deprecated Use [EMAIL PROTECTED] #onError(Exception, String)}
         */
+       @Deprecated
        protected String onError(final Exception ex)
        {
-               throw new HackAttackException("Invalid URL");
+               throw new PageExpiredException("Invalid URL");
        }
 
        protected String onError(final Exception ex, String url)
        {
-               log.error("Invalid URL: " + url, ex);
-
+               log.info("Invalid URL: " + url + ", message:" + 
ex.getMessage());
                return onError(ex);
        }