You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2014/02/20 16:56:10 UTC
[2/2] git commit: WICKET-831 Return response status 404 when a mapper
cannot decode a request url
WICKET-831 Return response status 404 when a mapper cannot decode a request url
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/3f5367f5
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/3f5367f5
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/3f5367f5
Branch: refs/heads/wicket-6.x
Commit: 3f5367f57994a518a16bdafbe2b9160ef1c7b1f0
Parents: 315472c
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Feb 20 17:46:31 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Feb 20 17:55:16 2014 +0200
----------------------------------------------------------------------
.../wicket/core/request/mapper/ResourceMapper.java | 15 +++++++++++++--
.../apache/wicket/request/mapper/AbstractMapper.java | 2 +-
2 files changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/3f5367f5/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/ResourceMapper.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/ResourceMapper.java b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/ResourceMapper.java
index 3455ec5..718ede2 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/ResourceMapper.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/ResourceMapper.java
@@ -18,12 +18,15 @@ package org.apache.wicket.core.request.mapper;
import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
import org.apache.wicket.Application;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.IRequestMapper;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;
+import org.apache.wicket.request.http.flow.AbortWithHttpErrorCodeException;
import org.apache.wicket.request.mapper.AbstractMapper;
import org.apache.wicket.request.mapper.parameter.IPageParametersEncoder;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -229,8 +232,16 @@ public class ResourceMapper extends AbstractMapper implements IRequestMapper
if (Strings.isEmpty(cacheUrl.getFileName()))
{
- throw new IllegalStateException("caching strategy returned empty name for " +
- resource);
+ if (Application.exists() && Application.get().usesDeploymentConfig())
+ {
+ throw new AbortWithHttpErrorCodeException(HttpServletResponse.SC_NOT_FOUND,
+ "caching strategy returned empty name for " + resource);
+ }
+ else
+ {
+ throw new IllegalStateException(
+ "caching strategy returned empty name for " + resource);
+ }
}
segments.set(lastSegmentAt, cacheUrl.getFileName());
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/3f5367f5/wicket-request/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.java b/wicket-request/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.java
index 5af0fb0..1857818 100644
--- a/wicket-request/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.java
@@ -227,4 +227,4 @@ public abstract class AbstractMapper implements IRequestMapper
return res;
}
-}
\ No newline at end of file
+}