Revision: 1158
http://stripes.svn.sourceforge.net/stripes/?rev=1158&view=rev
Author: fdaoud
Date: 2009-10-09 15:18:50 +0000 (Fri, 09 Oct 2009)
Log Message:
-----------
Reverted previous change
Modified Paths:
--------------
trunk/stripes/src/net/sourceforge/stripes/controller/DispatcherHelper.java
trunk/stripes/src/net/sourceforge/stripes/controller/ExecutionContext.java
Modified:
trunk/stripes/src/net/sourceforge/stripes/controller/DispatcherHelper.java
===================================================================
--- trunk/stripes/src/net/sourceforge/stripes/controller/DispatcherHelper.java
2009-10-08 00:45:07 UTC (rev 1157)
+++ trunk/stripes/src/net/sourceforge/stripes/controller/DispatcherHelper.java
2009-10-09 15:18:50 UTC (rev 1158)
@@ -455,14 +455,13 @@
public Resolution intercept(ExecutionContext ctx) throws Exception
{
Object returnValue = handler.invoke(bean);
fillInValidationErrors(ctx);
- ctx.setHandlerReturnValue(returnValue);
if (returnValue != null && returnValue instanceof Resolution) {
ctx.setResolutionFromHandler(true);
return (Resolution) returnValue;
}
else if (returnValue != null) {
- log.debug("Expected handler method ", handler.getName(), "
on class ",
+ log.warn("Expected handler method ", handler.getName(), "
on class ",
bean.getClass().getSimpleName(), " to return a
Resolution. Instead it ",
"returned: ", returnValue);
}
Modified:
trunk/stripes/src/net/sourceforge/stripes/controller/ExecutionContext.java
===================================================================
--- trunk/stripes/src/net/sourceforge/stripes/controller/ExecutionContext.java
2009-10-08 00:45:07 UTC (rev 1157)
+++ trunk/stripes/src/net/sourceforge/stripes/controller/ExecutionContext.java
2009-10-09 15:18:50 UTC (rev 1158)
@@ -50,7 +50,6 @@
private ActionBeanContext actionBeanContext;
private ActionBean actionBean;
private Method handler;
- private Object handlerReturnValue;
private Resolution resolution;
private LifecycleStage lifecycleStage;
private boolean resolutionFromHandler = false;
@@ -131,19 +130,6 @@
public void setHandler(Method handler) { this.handler = handler; }
/**
- * Retrieves the value that was returned by the handler method. Available
- * to interceptors only after {...@link LifecycleStage#EventHandling} has
occurred.
- *
- * @return the value that was returned by the handler method (could be
null)
- */
- public Object getHandlerReturnValue() { return handlerReturnValue; }
-
- /** Sets the value that was returned by the handler method. */
- public void setHandlerReturnValue(Object handlerReturnValue) {
- this.handlerReturnValue = handlerReturnValue;
- }
-
- /**
* Gets the Resolution that will be executed at the end of the execution.
This value
* is generally not populated until just prior to {...@link
LifecycleStage#ResolutionExecution}.
*
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Stripes-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/stripes-development
