[jboss-svn-commits] JBoss Portal SVN: r5434 - in trunk: portlet/src/main/org/jboss/portal/portlet/invocation wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer wsrp/src/main/org/jboss/portal/wsrp/consumer wsrp/src/main/org/jboss/portal/wsrp/producer
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Oct 12 20:28:50 EDT 2006
Author: chris.laprun at jboss.com
Date: 2006-10-12 20:28:42 -0400 (Thu, 12 Oct 2006)
New Revision: 5434
Modified:
trunk/portlet/src/main/org/jboss/portal/portlet/invocation/PortletInvocation.java
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MarkupTestCase.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ActionHandler.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/InvocationHandler.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/RenderHandler.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/SessionHandler.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/WSRPConsumerImpl.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/MarkupHandler.java
Log:
- Updated code to not use get/setResponse on PortletInvocation but rather use the returned value of invoke.
- Removed get/setResponse on PortletInvocation since they're not used anymore.
Modified: trunk/portlet/src/main/org/jboss/portal/portlet/invocation/PortletInvocation.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/invocation/PortletInvocation.java 2006-10-12 22:39:55 UTC (rev 5433)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/invocation/PortletInvocation.java 2006-10-13 00:28:42 UTC (rev 5434)
@@ -108,9 +108,7 @@
/** Temporarily here. */
private PortletInvocationResponse response;
- /**
- * Create an invocation to a portlet.
- */
+ /** Create an invocation to a portlet. */
protected PortletInvocation(PortletInvocationContext ctx)
{
if (ctx == null)
@@ -171,33 +169,25 @@
this.properties = properties;
}
- /**
- * Return the dispatched http servlet request.
- */
+ /** Return the dispatched http servlet request. */
public HttpServletResponse getDispatchedResponse()
{
return dresp;
}
- /**
- * Set the dispatched http servlet request.
- */
+ /** Set the dispatched http servlet request. */
public void setDispatchedResponse(HttpServletResponse dresp)
{
this.dresp = dresp;
}
- /**
- * Return the dispatched http servlet request.
- */
+ /** Return the dispatched http servlet request. */
public HttpServletRequest getDispatchedRequest()
{
return dreq;
}
- /**
- * Set the dispatched http servlet request.
- */
+ /** Set the dispatched http servlet request. */
public void setDispatchedRequest(HttpServletRequest dreq)
{
this.dreq = dreq;
@@ -263,13 +253,4 @@
this.windowContext = windowContext;
}
- public PortletInvocationResponse getResponse()
- {
- return response;
- }
-
- public void setResponse(PortletInvocationResponse response)
- {
- this.response = response;
- }
}
Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MarkupTestCase.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MarkupTestCase.java 2006-10-12 22:39:55 UTC (rev 5433)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MarkupTestCase.java 2006-10-13 00:28:42 UTC (rev 5434)
@@ -54,35 +54,31 @@
{
RenderInvocation render = createRenderInvocation(SOF.NULL_MARKUP_PORTLET_HANDLE);
- // juju - fixme
- render.setResponse(consumer.invoke(render));
+ PortletInvocationResponse response = consumer.invoke(render);
- assertTrue(render.getResponse() instanceof ErrorResponse);
+ assertTrue(response instanceof ErrorResponse);
render = createRenderInvocation(SOF.EMPTY_MARKUP_PORTLET_HANDLE);
- // juju - fixme
- render.setResponse(consumer.invoke(render));
+ response = consumer.invoke(render);
- checkRenderResult(render, "");
+ checkRenderResult(response, "");
}
public void testRender() throws Exception
{
RenderInvocation render = createRenderInvocation(SOF.PORTLET_HANDLE_1);
- // juju - fixme
- render.setResponse(consumer.invoke(render));
+ PortletInvocationResponse response = consumer.invoke(render);
- FragmentResponse result = checkRenderResult(render, "portlet1:view:maximized");
+ FragmentResponse result = checkRenderResult(response, "portlet1:view:maximized");
assertEquals(15, result.getExpirationSecs());
render = createRenderInvocation(SOF.PORTLET_HANDLE_2);
- // juju - fixme
- render.setResponse(consumer.invoke(render));
+ response = consumer.invoke(render);
- result = checkRenderResult(render, "portlet2:0:view:maximized");
+ result = checkRenderResult(response, "portlet2:0:view:maximized");
assertEquals(0, result.getExpirationSecs());
}
@@ -95,10 +91,7 @@
action.setUserContext(new BasicUserContext());
action.setAttribute(PortletInvocation.REQUEST_SCOPE, PortletInvocation.PORTLET_CONTEXT_ATTRIBUTE, new PortletContext(SOF.PORTLET_HANDLE_1));
- // juju - fixme
- action.setResponse(consumer.invoke(action));
-
- PortletInvocationResponse response = action.getResponse();
+ PortletInvocationResponse response = consumer.invoke(action);
assertNotNull(response);
assertTrue(response instanceof RenderResponse);
RenderResponse render = (RenderResponse)response;
@@ -107,19 +100,18 @@
RenderInvocation renderInvocation = createRenderInvocation(SOF.PORTLET_HANDLE_1);
((TestPortletInvocationContext)renderInvocation.getContext()).ns = "ns1";
- // juju - fixme
- renderInvocation.setResponse(consumer.invoke(renderInvocation));
- checkRenderResult(renderInvocation, "portlet1:view:maximized:ns1");
+ response = consumer.invoke(renderInvocation);
+ checkRenderResult(response, "portlet1:view:maximized:ns1");
}
public void testSessionHandling() throws Exception
{
RenderInvocation render = createRenderInvocation(SOF.PORTLET_HANDLE_2);
- // juju - fixme
- render.setResponse(consumer.invoke(render));
- checkRenderResult(render, "portlet2:0:view:maximized");
+ PortletInvocationResponse response = consumer.invoke(render);
+ checkRenderResult(response, "portlet2:0:view:maximized");
+
// checking session information
ProducerSessionInformation sessionInfo = consumer.getProducerSessionInformationFrom(render);
String sessionId = sessionInfo.getSessionIdForPortlet(SOF.PORTLET_HANDLE_2);
@@ -129,9 +121,8 @@
assertFalse(sessionInfo.isPerGroupCookies());
assertFalse(sessionInfo.isInitCookieDone());
- // juju - fixme
- render.setResponse(consumer.invoke(render));
- checkRenderResult(render, "portlet2:1:view:maximized");
+ response = consumer.invoke(render);
+ checkRenderResult(response, "portlet2:1:view:maximized");
}
public void testInitCookie() throws Exception
@@ -142,8 +133,7 @@
HttpSession session = invocationContext.mockRequest.getSession();
producer.setResponse(invocationContext.mockResponse);
- // juju - fixme
- render.setResponse(consumer.invoke(render));
+ consumer.invoke(render);
ProducerSessionInformation sessionInfo = consumer.getProducerSessionInformationFrom(session);
assertFalse(sessionInfo.isPerGroupCookies());
@@ -156,8 +146,7 @@
session = invocationContext.mockRequest.getSession();
producer.setResponse(invocationContext.mockResponse);
- // juju - fixme
- render.setResponse(consumer.invoke(render));
+ consumer.invoke(render);
sessionInfo = consumer.getProducerSessionInformationFrom(session);
assertFalse(sessionInfo.isPerGroupCookies());
@@ -165,9 +154,8 @@
assertNotNull(sessionInfo.getUserCookie());
}
- private FragmentResponse checkRenderResult(RenderInvocation render, String markup)
+ private FragmentResponse checkRenderResult(PortletInvocationResponse response, String markup)
{
- PortletInvocationResponse response = render.getResponse();
assertNotNull(response);
assertTrue(response instanceof FragmentResponse);
FragmentResponse fragment = (FragmentResponse)response;
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ActionHandler.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ActionHandler.java 2006-10-12 22:39:55 UTC (rev 5433)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ActionHandler.java 2006-10-13 00:28:42 UTC (rev 5434)
@@ -29,6 +29,7 @@
import org.jboss.portal.portlet.invocation.PortletInvocation;
import org.jboss.portal.portlet.invocation.response.ErrorResponse;
import org.jboss.portal.portlet.invocation.response.HTTPRedirectionResponse;
+import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
import org.jboss.portal.portlet.invocation.response.RenderResponse;
import org.jboss.portal.portlet.spi.ActionContext;
import org.jboss.portal.portlet.spi.InstanceContext;
@@ -114,7 +115,7 @@
interactionParams);
}
- protected void processResponse(Object response, PortletInvocation invocation, RequestPrecursor requestPrecursor)
+ protected PortletInvocationResponse processResponse(Object response, PortletInvocation invocation, RequestPrecursor requestPrecursor)
{
BlockingInteractionResponse blockingInteractionResponse = (BlockingInteractionResponse)response;
@@ -122,13 +123,12 @@
UpdateResponse updateResponse = blockingInteractionResponse.getUpdateResponse();
if (redirectURL != null && updateResponse != null)
{
- invocation.setResponse(new ErrorResponse(
- new IllegalArgumentException("Response cannot both redirect and update state.")));
+ return new ErrorResponse(new IllegalArgumentException("Response cannot both redirect and update state."));
}
if (redirectURL != null)
{
- invocation.setResponse(new HTTPRedirectionResponse(redirectURL)); // do we need to process URLs?
+ return new HTTPRedirectionResponse(redirectURL); // do we need to process URLs?
}
else
{
@@ -165,7 +165,7 @@
+ "' updated the portlet handle.");
}
- invocation.setResponse(result);
+ return result;
}
}
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/InvocationHandler.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/InvocationHandler.java 2006-10-12 22:39:55 UTC (rev 5433)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/InvocationHandler.java 2006-10-13 00:28:42 UTC (rev 5434)
@@ -27,6 +27,7 @@
import org.jboss.portal.portlet.PortletInvokerException;
import org.jboss.portal.portlet.invocation.PortletInvocation;
import org.jboss.portal.portlet.invocation.response.ErrorResponse;
+import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
import org.jboss.portal.portlet.spi.InstanceContext;
import org.jboss.portal.portlet.spi.WindowContext;
import org.jboss.portal.wsrp.core.InvalidCookieFault;
@@ -65,7 +66,7 @@
this.consumer = consumer;
}
- void handle(PortletInvocation invocation) throws PortletInvokerException
+ PortletInvocationResponse handle(PortletInvocation invocation) throws PortletInvokerException
{
// Extracts basic required information from invocation
RequestPrecursor requestPrecursor = new RequestPrecursor(consumer, invocation);
@@ -83,13 +84,12 @@
{
throw new InvokerUnavailableException(e.getMessage(), e);
}
- if (response == null)
+ if (response instanceof ErrorResponse)
{
- unwrapWSRPError(invocation);
- return;
+ return unwrapWSRPError((ErrorResponse)response);
}
- processResponse(response, invocation, requestPrecursor);
+ return processResponse(response, invocation, requestPrecursor);
}
protected Object performRequest(Object request, PortletInvocation invocation)
@@ -99,12 +99,11 @@
Object response = null;
// as long as we don't get a non-null response and we're allowed to try again, try to perform the request
- while (response == null && retryCount != DO_NOT_RETRY && retryCount < MAXIMUM_RETRY_NUMBER)
+ while (response == null && retryCount < MAXIMUM_RETRY_NUMBER)
{
- // prepare everything for the request
SessionHandler sessionHandler = consumer.getSessionHandler();
- sessionHandler.initCookieIfNeeded(invocation);
+ // prepare everything for the request
updateRegistrationContext(request);
RuntimeContext runtimeContext = getRuntimeContextFrom(request);
@@ -119,6 +118,8 @@
try
{
+ sessionHandler.initCookieIfNeeded(invocation);
+
// if we need cookies, set the current group id
sessionHandler.initProducerSessionInformation(invocation);
@@ -128,7 +129,15 @@
}
catch (Exception e)
{
- retryCount = dealWithError(e, invocation, runtimeContext, retryCount);
+ ErrorResponse errorResponse = dealWithError(e, invocation, runtimeContext);
+ if (errorResponse != null)
+ {
+ return errorResponse;
+ }
+ else
+ {
+ retryCount++;
+ }
}
finally
{
@@ -145,10 +154,10 @@
* @param error the error that is to be dealt with
* @param invocation the invocation that caused the error to occur
* @param runtimeContext the current WSRP RuntimeContext
- * @param retryCount the number of times we tried to perform the invocation at the time the error occurred
- * @return the updated number of re-try or <code>DO_NOT_RETRY</code> if the error was fatal
+ * @return an ErrorResponse if the error couldn't be dealt with or <code>null</code> if the error was correctly
+ * handled
*/
- private int dealWithError(Exception error, PortletInvocation invocation, RuntimeContext runtimeContext, int retryCount)
+ private ErrorResponse dealWithError(Exception error, PortletInvocation invocation, RuntimeContext runtimeContext)
throws ServiceDescriptionUnavailableException
{
log.error("The portlet threw an exception", error);
@@ -160,7 +169,15 @@
{
log.debug("Re-initializing cookies after InvalidCookieFault.");
// we need to re-init the cookies
- sessionHandler.initCookieIfNeeded(invocation);
+ try
+ {
+ sessionHandler.initCookieIfNeeded(invocation);
+ }
+ catch (Exception e)
+ {
+ log.debug("Couldn't init cookie: " + e.getLocalizedMessage());
+ return new ErrorResponse(e);
+ }
}
else if (error instanceof InvalidSessionFault)
{
@@ -173,7 +190,7 @@
}
else if (error instanceof RemoteException)
{
- // todo: remove, needed right now to handle BEA because of JBWS error file a bug!!
+ // todo: remove when we upgrade to 1.0.3+ see: http://jira.jboss.com/jira/browse/JBWS-955
RemoteException re = (RemoteException)error;
Throwable detail = re.detail;
if (detail instanceof SOAPFaultException)
@@ -193,8 +210,7 @@
}
else
{
- invocation.setResponse(new ErrorResponse(error));
- return DO_NOT_RETRY;
+ return new ErrorResponse(error);
}
}
}
@@ -202,16 +218,14 @@
else
{
// other errors cannot be dealt with: we have an error condition
- invocation.setResponse(new ErrorResponse(error));
- return DO_NOT_RETRY;
+ return new ErrorResponse(error);
}
- return ++retryCount;
+ return null;
}
- protected void unwrapWSRPError(PortletInvocation invocation)
+ protected ErrorResponse unwrapWSRPError(ErrorResponse errorResponse)
{
- ErrorResponse errorResult = (ErrorResponse)invocation.getResponse();
- Throwable cause = errorResult.getThrowable();
+ Throwable cause = errorResponse.getThrowable();
if (cause != null)
{
// unwrap original exception...
@@ -224,10 +238,12 @@
cause = ((RemoteException)cause).detail;
}
log.debug("Invocation of action failed: " + cause.getMessage(), cause); // fix-me?
+ return new ErrorResponse(cause);
}
else
{
- log.debug("Invocation of action failed: " + errorResult.getMessage());
+ log.debug("Invocation of action failed: " + errorResponse.getMessage());
+ return errorResponse;
}
}
@@ -241,6 +257,6 @@
protected abstract Object prepareRequest(RequestPrecursor requestPrecursor, PortletInvocation invocation);
- protected abstract void processResponse(Object response, PortletInvocation invocation, RequestPrecursor requestPrecursor);
+ protected abstract PortletInvocationResponse processResponse(Object response, PortletInvocation invocation, RequestPrecursor requestPrecursor);
}
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/RenderHandler.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/RenderHandler.java 2006-10-12 22:39:55 UTC (rev 5433)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/RenderHandler.java 2006-10-13 00:28:42 UTC (rev 5434)
@@ -28,6 +28,7 @@
import org.jboss.portal.portlet.invocation.PortletInvocation;
import org.jboss.portal.portlet.invocation.response.ErrorResponse;
import org.jboss.portal.portlet.invocation.response.FragmentResponse;
+import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
import org.jboss.portal.portlet.spi.PortletInvocationContext;
import org.jboss.portal.wsrp.WSRPPortletURL;
import org.jboss.portal.wsrp.WSRPResourceURL;
@@ -83,7 +84,7 @@
requestPrecursor.runtimeContext, requestPrecursor.markupParams);
}
- protected void processResponse(Object response, PortletInvocation invocation, RequestPrecursor requestPrecursor)
+ protected PortletInvocationResponse processResponse(Object response, PortletInvocation invocation, RequestPrecursor requestPrecursor)
{
MarkupResponse markupResponse = (MarkupResponse)response;
@@ -95,8 +96,7 @@
byte[] binary = markupContext.getMarkupBinary();
if (markup != null && binary != null)
{
- invocation.setResponse(new ErrorResponse(
- new IllegalArgumentException("Markup response cannot contain both string and binary markup.")));
+ return new ErrorResponse(new IllegalArgumentException("Markup response cannot contain both string and binary markup."));
}
if (markup != null && markup.length() > 0)
@@ -118,7 +118,7 @@
PrintWriter writer = result.getWriter();
writer.write(markup);
- invocation.setResponse(result);
+ return result;
}
protected void updateUserContext(Object request, UserContext userContext)
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/SessionHandler.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/SessionHandler.java 2006-10-12 22:39:55 UTC (rev 5433)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/SessionHandler.java 2006-10-13 00:28:42 UTC (rev 5434)
@@ -26,7 +26,6 @@
import org.jboss.portal.common.util.ParameterValidation;
import org.jboss.portal.portlet.InvokerUnavailableException;
import org.jboss.portal.portlet.invocation.PortletInvocation;
-import org.jboss.portal.portlet.invocation.response.ErrorResponse;
import org.jboss.portal.wsrp.WSRPTypeFactory;
import org.jboss.portal.wsrp.consumer.portlet.info.WSRPPortletInfo;
import org.jboss.portal.wsrp.core.CookieProtocol;
@@ -111,7 +110,7 @@
RequestHeaderClientHandler.resetCurrentInfo();
}
- public void initCookieIfNeeded(PortletInvocation invocation) throws ServiceDescriptionUnavailableException
+ public void initCookieIfNeeded(PortletInvocation invocation) throws Exception
{
try
{
@@ -124,7 +123,7 @@
}
private void initCookieIfNeeded(PortletInvocation invocation, boolean retryIfFails)
- throws ServiceDescriptionUnavailableException, InvokerUnavailableException
+ throws Exception, InvokerUnavailableException
{
// check if the cookie protocol requires cookie initialization
if (!requiresInitCookie())
@@ -160,10 +159,6 @@
initCookie(initCookie, invocation, retryIfFails);
}
}
- catch (Exception e)
- {
- throw new RuntimeException("Couldn't initCookie", e);
- }
finally
{
resetCurrentlyHeldInformation();
@@ -174,7 +169,7 @@
}
private void initCookie(InitCookie initCookie, PortletInvocation invocation, boolean retryIfFails)
- throws ServiceDescriptionUnavailableException, InvokerUnavailableException
+ throws Exception, InvokerUnavailableException
{
try
{
@@ -191,7 +186,7 @@
catch (Exception e)
{
log.fatal("initCookie failed!", e);
- invocation.setResponse(new ErrorResponse(e));
+ throw e;
}
}
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/WSRPConsumerImpl.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/WSRPConsumerImpl.java 2006-10-12 22:39:55 UTC (rev 5433)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/WSRPConsumerImpl.java 2006-10-13 00:28:42 UTC (rev 5434)
@@ -22,12 +22,12 @@
package org.jboss.portal.wsrp.consumer;
import org.jboss.portal.common.invocation.InvocationException;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
import org.jboss.portal.portlet.InvokerUnavailableException;
import org.jboss.portal.portlet.NoSuchPortletException;
import org.jboss.portal.portlet.Portlet;
-import org.jboss.portal.portlet.PortletInvokerException;
import org.jboss.portal.portlet.PortletContext;
-import org.jboss.portal.portlet.state.PropertyMap;
+import org.jboss.portal.portlet.PortletInvokerException;
import org.jboss.portal.portlet.impl.spi.AbstractPortletInvocationContext;
import org.jboss.portal.portlet.invocation.ActionInvocation;
import org.jboss.portal.portlet.invocation.PortletInvocation;
@@ -35,6 +35,7 @@
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
import org.jboss.portal.portlet.spi.UserContext;
import org.jboss.portal.portlet.state.PropertyChange;
+import org.jboss.portal.portlet.state.PropertyMap;
import org.jboss.portal.wsrp.UserContextConverter;
import org.jboss.portal.wsrp.WSRPConstants;
import org.jboss.portal.wsrp.WSRPConsumer;
@@ -55,7 +56,6 @@
import org.jboss.portal.wsrp.core.WSRP_v1_Registration_PortType;
import org.jboss.portal.wsrp.core.WSRP_v1_ServiceDescription_PortType;
import org.jboss.portal.wsrp.services.ServiceFactory;
-import org.jboss.portal.jems.as.system.AbstractJBossService;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
@@ -201,10 +201,7 @@
throw new InvocationException("Unknown invocation type: " + invocation);
}
- handler.handle(invocation);
-
- // juju - fixme
- return invocation.getResponse();
+ return handler.handle(invocation);
}
public PortletContext createClone(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/MarkupHandler.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/MarkupHandler.java 2006-10-12 22:39:55 UTC (rev 5433)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/MarkupHandler.java 2006-10-13 00:28:42 UTC (rev 5434)
@@ -38,8 +38,8 @@
import org.jboss.portal.portlet.invocation.response.ErrorResponse;
import org.jboss.portal.portlet.invocation.response.FragmentResponse;
import org.jboss.portal.portlet.invocation.response.HTTPRedirectionResponse;
-import org.jboss.portal.portlet.invocation.response.RenderResponse;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
+import org.jboss.portal.portlet.invocation.response.RenderResponse;
import org.jboss.portal.portlet.spi.InstanceContext;
import org.jboss.portal.portlet.spi.PortalContext;
import org.jboss.portal.portlet.spi.SecurityContext;
@@ -191,11 +191,11 @@
renderContext.contextualize(render);
render.setAttribute(PortletInvocation.REQUEST_SCOPE, PortletInvocation.PORTLET_CONTEXT_ATTRIBUTE, portlet.getContext());
+ PortletInvocationResponse response;
try
{
log.debug("RenderInvocation on portlet '" + portletHandle + "'");
- // juju - fixme
- render.setResponse(producer.getInvoker().invoke(render));
+ response = producer.getInvoker().invoke(render);
log.debug("RenderInvocation done");
}
catch (PortletInvokerException e)
@@ -203,7 +203,6 @@
throw WSRPUtils.createOperationFailedFault(e);
}
- PortletInvocationResponse response = render.getResponse();
checkForError(response);
FragmentResponse fragment = (FragmentResponse)response;
@@ -364,11 +363,11 @@
context.contextualize(invocation);
invocation.setAttribute(PortletInvocation.REQUEST_SCOPE, PortletInvocation.PORTLET_CONTEXT_ATTRIBUTE, portlet.getContext());
+ PortletInvocationResponse response;
try
{
log.debug("ActionInvocation on portlet '" + portletHandle + "'");
- // juju - fixme
- invocation.setResponse(producer.getInvoker().invoke(invocation));
+ response = producer.getInvoker().invoke(invocation);
log.debug("ActionInvocation done");
}
catch (PortletInvokerException e)
@@ -377,7 +376,6 @@
throw WSRPUtils.createOperationFailedFault(e);
}
- PortletInvocationResponse response = invocation.getResponse();
checkForError(response);
if (response instanceof RenderResponse)
More information about the jboss-svn-commits
mailing list