[MMBASE CVS] src/org/mmbase/framework FrameworkFilter.java

[Michiel Meeuwissen]

Update of /var/cvs/src/org/mmbase/framework
In directory james.mmbase.org:/tmp/cvs-serv10667

Modified Files:
        FrameworkFilter.java 
Log Message:
if 'filtered' by a specified url converter, don't jump to another one. 


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/framework


Index: FrameworkFilter.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/FrameworkFilter.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- FrameworkFilter.java        25 Aug 2008 21:45:19 -0000      1.30
+++ FrameworkFilter.java        1 Sep 2008 21:05:02 -0000       1.31
@@ -36,7 +36,7 @@
  * 'excludes' parameter in web.xml.
  *
  * @author André van Toly
- * @version $Id: FrameworkFilter.java,v 1.30 2008/08/25 21:45:19 michiel Exp $
+ * @version $Id: FrameworkFilter.java,v 1.31 2008/09/01 21:05:02 michiel Exp $
  */
 
 public class FrameworkFilter implements Filter, MMBaseStarter  {
@@ -169,18 +169,18 @@
                 chain.doFilter(request, response);
                 return;
             }
-            Parameters params = fw.createParameters();
-            if (params.containsParameter(Parameter.REQUEST)) {
-                params.set(Parameter.REQUEST, req);
+            Parameters frameworkParameters = fw.createParameters();
+            if (frameworkParameters.containsParameter(Parameter.REQUEST)) {
+                frameworkParameters.set(Parameter.REQUEST, req);
             }
-            if (params.containsParameter(Parameter.RESPONSE)) {
-                params.set(Parameter.RESPONSE, res);
+            if (frameworkParameters.containsParameter(Parameter.RESPONSE)) {
+                frameworkParameters.set(Parameter.RESPONSE, res);
             }
             try {
-                String forwardUrl = fw.getInternalUrl(path, 
req.getParameterMap(), params);
+                String forwardUrl = fw.getInternalUrl(path, 
req.getParameterMap(), frameworkParameters);
 
                 if (log.isDebugEnabled()) {
-                    log.debug("Received '" + forwardUrl + "' from framework, 
forwarding. rp:" + req.getParameterMap() + " fwp:" + params);
+                    log.debug("Received '" + forwardUrl + "' from framework, 
forwarding. rp:" + req.getParameterMap() + " fwp:" + frameworkParameters);
                 }
 
                 if (forwardUrl != null && !forwardUrl.equals("")) {
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs