From abbbcc3bbff5c5305ef46467311cd2b7a3e376c5 Mon Sep 17 00:00:00 2001 From: Keith Donald Date: Fri, 25 Apr 2008 04:43:45 +0000 Subject: [PATCH] 1.4 compat --- .../context/portlet/PortletExternalContext.java | 15 ++++++++------- .../context/servlet/ServletExternalContext.java | 4 +++- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/spring-webflow/src/main/java/org/springframework/webflow/context/portlet/PortletExternalContext.java b/spring-webflow/src/main/java/org/springframework/webflow/context/portlet/PortletExternalContext.java index e1b641a9..41ed98f4 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/context/portlet/PortletExternalContext.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/context/portlet/PortletExternalContext.java @@ -199,19 +199,20 @@ public class PortletExternalContext implements ExternalContext { if (this.isRenderPhase()) { return flowUrlHandler.createFlowExecutionUrl(flowId, flowExecutionKey, (RenderResponse) response); } else { - throw new IllegalStateException("Only a render request can obtain an flow execution uri"); + throw new IllegalStateException("You can only obtain a flow execution URL in a RenderRequest"); } } public Writer getResponseWriter() { + if (!isRenderPhase()) { + throw new IllegalStateException("You can only access a response Writer in a RenderRequest"); + } try { - if (isRenderPhase()) { - return ((RenderResponse) response).getWriter(); - } else { - throw new IllegalStateException("Only render requests can obtain response writer"); - } + return ((RenderResponse) response).getWriter(); } catch (IOException e) { - throw new IllegalStateException("Unable to obtain response writer", e); + IllegalStateException ise = new IllegalStateException("Unable to access the response Writer"); + ise.initCause(e); + throw ise; } } diff --git a/spring-webflow/src/main/java/org/springframework/webflow/context/servlet/ServletExternalContext.java b/spring-webflow/src/main/java/org/springframework/webflow/context/servlet/ServletExternalContext.java index b0aebb45..20dcfff2 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/context/servlet/ServletExternalContext.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/context/servlet/ServletExternalContext.java @@ -203,7 +203,9 @@ public class ServletExternalContext implements ExternalContext { try { return response.getWriter(); } catch (IOException e) { - throw new IllegalStateException("Unable to obtain response writer", e); + IllegalStateException ise = new IllegalStateException("Unable to access the response Writer"); + ise.initCause(e); + throw ise; } }