svn commit: r533198 - in /cocoon/trunk/core/cocoon-core: src/main/java/org/apache/cocoon/servlet/multipart/MultipartFilter.java status.xml

[jo...@apache.org]

Author: joerg
Date: Fri Apr 27 12:41:59 2007
New Revision: 533198

URL: http://svn.apache.org/viewvc?view=rev&rev=533198
Log:
COCOON-2055: Fix MultipartFilter cleaning up the request and so disposing the uploaded files before the request has been processed actually (thanks to Martin Heiden).

Added:
    cocoon/trunk/core/cocoon-core/status.xml   (with props)
Modified:
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/multipart/MultipartFilter.java

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/multipart/MultipartFilter.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/multipart/MultipartFilter.java?view=diff&rev=533198&r1=533197&r2=533198
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/multipart/MultipartFilter.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/multipart/MultipartFilter.java Fri Apr 27 12:41:59 2007
@@ -86,7 +86,7 @@
             this.settings = (Settings) this.cocoonBeanFactory.getBean(Settings.ROLE);
             this.servletSettings = new ServletSettings(this.settings);
             String containerEncoding;
-            final String encoding = settings.getContainerEncoding();
+            final String encoding = this.settings.getContainerEncoding();
             if ( encoding == null ) {
                 containerEncoding = "ISO-8859-1";
             } else {
@@ -116,6 +116,7 @@
         HttpServletResponse response = (HttpServletResponse) res;
         try{
             request = this.requestFactory.getServletRequest(request);
+            filterChain.doFilter(request, response);
         } catch (Exception e) {
             if (getLogger().isErrorEnabled()) {
                 getLogger().error("Problem in multipart filter. Unable to create request.", e);
@@ -137,10 +138,10 @@
                 getLogger().error("MultipartFilter got an exception while trying to cleanup the uploaded files.", e);
             }
         }
-        filterChain.doFilter(request, response);
     }
 
     protected Logger getLogger() {
         return this.log;
     }
+    
 }

Added: cocoon/trunk/core/cocoon-core/status.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/status.xml?view=auto&rev=533198
==============================================================================
--- cocoon/trunk/core/cocoon-core/status.xml (added)
+++ cocoon/trunk/core/cocoon-core/status.xml Fri Apr 27 12:41:59 2007
@@ -0,0 +1,77 @@
+<?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!DOCTYPE status [
+<!ELEMENT status (developers?, todo?, changes)>
+<!ELEMENT developers (person+)>
+<!ELEMENT person EMPTY>
+<!ATTLIST person
+  name CDATA #REQUIRED
+  email CDATA #REQUIRED
+  id CDATA #REQUIRED
+>
+<!ELEMENT todo (actions+)>
+<!ELEMENT actions (action+)>
+<!ATTLIST actions
+  priority (high | medium | low) #REQUIRED
+>
+<!ELEMENT changes (release+)>
+<!ELEMENT release (action+)>
+<!ATTLIST release
+  version CDATA #REQUIRED
+  date CDATA #REQUIRED
+>
+<!ELEMENT action (#PCDATA | link | br | code | ul | strong)*>
+<!ATTLIST action
+  context (build | code | docs) #IMPLIED
+  assigned-to CDATA #IMPLIED
+  dev CDATA #IMPLIED
+  type (add | fix | remove | update) #IMPLIED
+  fixes-bug CDATA #IMPLIED
+  due-to CDATA #IMPLIED
+  due-to-email CDATA #IMPLIED
+>
+<!ELEMENT code (#PCDATA)>
+<!ELEMENT br EMPTY>
+<!ELEMENT strong (#PCDATA)>
+<!ELEMENT link (#PCDATA)>
+<!ATTLIST link
+  href CDATA #REQUIRED
+>
+<!ELEMENT ul (li)+>
+<!ELEMENT li (#PCDATA | link | br | code | ul)*>
+<!ENTITY eacute           "&#x000E9;">
+<!ENTITY ouml             "&#x000F6;">
+<!ENTITY uuml             "&#x000FC;">
+<!ENTITY ccedil           "&#x000E7;">
+]>
+
+<!-- SVN $Id: status.xml 449149 2006-09-23 03:58:05Z crossley $ -->
+
+<status>
+ <!-- The following list contains the changes since the latest 2.1.x version. -->
+ <changes>
+  <release version="@version@" date="@date@">
+    <action dev="JH" type="fix" fixes-bug="COCOON-2055" due-to="Martin Heiden" due-to-email="martin.heiden@netcologne.de">
+      Fix MultipartFilter cleaning up the request and so disposing the uploaded
+      files before the request has been processed actually.
+    </action>
+  </release>
+ </changes>
+
+</status>
+

Propchange: cocoon/trunk/core/cocoon-core/status.xml
------------------------------------------------------------------------------
    svn:eol-style = native