Author: apetrelli
Date: Sun Mar 2 11:45:00 2008
New Revision: 632816
URL: http://svn.apache.org/viewvc?rev=632816&view=rev
Log:
TILES-255
Committed a modified version of the patch submitted by Thom Hehl.
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContext.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletTilesRequestContext.java
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContext.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContext.java?rev=632816&r1=632815&r2=632816&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContext.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContext.java
Sun Mar 2 11:45:00 2008
@@ -28,6 +28,7 @@
import javax.portlet.PortletContext;
import javax.portlet.PortletException;
import javax.portlet.PortletRequest;
+import javax.portlet.PortletRequestDispatcher;
import javax.portlet.PortletResponse;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
@@ -236,7 +237,15 @@
public void include(String path) throws IOException {
if (isRenderRequest) {
try {
- context.getRequestDispatcher(path).include((RenderRequest)
request,
+ PortletRequestDispatcher rd =
context.getRequestDispatcher(path);
+
+ if (rd == null) {
+ throw new IOException(
+ "No portlet request dispatcher returned for path '"
+ + path + "'");
+ }
+
+ rd.include((RenderRequest) request,
(RenderResponse) response);
} catch (PortletException e) {
throw new TilesIOException(
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletTilesRequestContext.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletTilesRequestContext.java?rev=632816&r1=632815&r2=632816&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletTilesRequestContext.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletTilesRequestContext.java
Sun Mar 2 11:45:00 2008
@@ -188,6 +188,12 @@
*/
protected void forward(String path) throws IOException {
RequestDispatcher rd = request.getRequestDispatcher(path);
+
+ if (rd == null) {
+ throw new IOException("No request dispatcher returned for path '"
+ + path + "'");
+ }
+
try {
rd.forward(request, response);
} catch (ServletException ex) {
@@ -201,6 +207,12 @@
public void include(String path) throws IOException {
ServletUtil.setForceInclude(request, true);
RequestDispatcher rd = request.getRequestDispatcher(path);
+
+ if (rd == null) {
+ throw new IOException("No request dispatcher returned for path '"
+ + path + "'");
+ }
+
try {
rd.include(request, response);
} catch (ServletException ex) {
