You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2016/04/19 23:17:19 UTC

wicket git commit: WICKET-6144 guard against invalid value

Repository: wicket
Updated Branches:
  refs/heads/wicket-6.x 23ab41204 -> be84f1b3a


WICKET-6144 guard against invalid value


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/be84f1b3
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/be84f1b3
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/be84f1b3

Branch: refs/heads/wicket-6.x
Commit: be84f1b3a3737013a059586920f08540066c4471
Parents: 23ab412
Author: Sven Meier <sv...@apache.org>
Authored: Tue Apr 19 23:14:34 2016 +0200
Committer: Sven Meier <sv...@apache.org>
Committed: Tue Apr 19 23:16:22 2016 +0200

----------------------------------------------------------------------
 .../java/org/apache/wicket/request/http/WebRequest.java     | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/be84f1b3/wicket-request/src/main/java/org/apache/wicket/request/http/WebRequest.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/http/WebRequest.java b/wicket-request/src/main/java/org/apache/wicket/request/http/WebRequest.java
index 325f89e..fbadee2 100644
--- a/wicket-request/src/main/java/org/apache/wicket/request/http/WebRequest.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/http/WebRequest.java
@@ -25,6 +25,7 @@ import javax.servlet.http.Cookie;
 import org.apache.wicket.request.IRequestParameters;
 import org.apache.wicket.request.Request;
 import org.apache.wicket.request.Url;
+import org.apache.wicket.util.string.StringValueConversionException;
 import org.apache.wicket.util.string.Strings;
 import org.apache.wicket.util.time.Time;
 
@@ -114,8 +115,12 @@ public abstract class WebRequest extends Request
 	 */
 	public boolean isAjax()
 	{
-		return Strings.isTrue(getHeader(HEADER_AJAX)) ||
-			Strings.isTrue(getQueryParameters().getParameterValue(PARAM_AJAX).toString());
+		try {
+			return Strings.isTrue(getHeader(HEADER_AJAX)) ||
+				Strings.isTrue(getQueryParameters().getParameterValue(PARAM_AJAX).toString());
+		} catch (StringValueConversionException invalidValue) {
+			return false;
+		}
 	}
 
 	/**