You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@cocoon.apache.org by re...@apache.org on 2008/08/27 17:53:59 UTC

svn commit: r689506 - /cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/node/StatusCodeCollector.java

Author: reinhard
Date: Wed Aug 27 08:53:59 2008
New Revision: 689506

URL: http://svn.apache.org/viewvc?rev=689506&view=rev
Log:
resolve parameters in "status-code"

Modified:
    cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/node/StatusCodeCollector.java

Modified: cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/node/StatusCodeCollector.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/node/StatusCodeCollector.java?rev=689506&r1=689505&r2=689506&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/node/StatusCodeCollector.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/node/StatusCodeCollector.java Wed Aug 27 08:53:59 2008
@@ -20,6 +20,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.cocoon.corona.sitemap.Invocation;
 import org.apache.cocoon.corona.sitemap.node.InvocationResult;
 import org.apache.cocoon.corona.sitemap.node.SerializeNode;
 import org.aspectj.lang.ProceedingJoinPoint;
@@ -49,10 +50,10 @@
         THREAD_LOCAL.set(statusCode);
     }
 
-    @Around("execution(org.apache.cocoon.corona.sitemap.node.InvocationResult org.apache.cocoon.corona.sitemap.node.SerializeNode.invoke(org.apache.cocoon.corona.sitemap.Invocation))")
-    public Object interceptInvoke(ProceedingJoinPoint proceedingJoinPoint) throws Throwable {
+    @Around("execution(* org.apache.cocoon.corona.sitemap.node.SerializeNode.invoke(..)) && args(invocation)")
+    public Object interceptInvoke(ProceedingJoinPoint proceedingJoinPoint, Invocation invocation) throws Throwable {
         SerializeNode target = (SerializeNode) proceedingJoinPoint.getTarget();
-        String statusCode = target.getParameters().get("status-code");
+        String statusCode = invocation.resolveParameter(target.getParameters().get("status-code"));
 
         InvocationResult invocationResult = (InvocationResult) proceedingJoinPoint.proceed();