You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2008/08/30 08:09:51 UTC

svn commit: r690476 - in /myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload: FileUploadConfiguratorImpl.java UploadedFiles.java

Author: matzew
Date: Fri Aug 29 23:09:51 2008
New Revision: 690476

URL: http://svn.apache.org/viewvc?rev=690476&view=rev
Log:
TRINIDAD-1211 - FileUploadConfiguratorImpl should call UploadedFiles.dispose() in endRequest()

calling dispose() only (for now) in non-portlet env.

Modified:
    myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/FileUploadConfiguratorImpl.java
    myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/UploadedFiles.java

Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/FileUploadConfiguratorImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/FileUploadConfiguratorImpl.java?rev=690476&r1=690475&r2=690476&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/FileUploadConfiguratorImpl.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/FileUploadConfiguratorImpl.java Fri Aug 29 23:09:51 2008
@@ -170,6 +170,20 @@
   }
 
   /* (non-Javadoc)
+   * @see org.apache.myfaces.trinidad.config.Configurator#endRequest(javax.faces.context.ExternalContext)
+   */
+  @Override
+  public void endRequest(ExternalContext externalContext)
+  {
+    // TODO matzew check portlet env.
+    if(!ExternalContextUtils.isPortlet(externalContext))
+    {
+      UploadedFiles files = UploadedFiles.getUploadedFiles(externalContext);
+      files.dispose();
+    }
+  }
+
+  /* (non-Javadoc)
    * @see org.apache.myfaces.trinidad.config.Configurator#init(javax.faces.context.ExternalContext)
    */
   @Override

Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/UploadedFiles.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/UploadedFiles.java?rev=690476&r1=690475&r2=690476&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/UploadedFiles.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/UploadedFiles.java Fri Aug 29 23:09:51 2008
@@ -50,8 +50,17 @@
   @SuppressWarnings("unchecked")
   static public UploadedFiles getUploadedFiles(FacesContext context)
   {
+    return getUploadedFiles(context.getExternalContext());
+  }
+
+  /**
+   * Returns the map of uploaded files for the current request.
+   */
+  @SuppressWarnings("unchecked")
+  static public UploadedFiles getUploadedFiles(ExternalContext context)
+  {
     Map<String, Object> requestMap =
-      context.getExternalContext().getRequestMap();
+      context.getRequestMap();
     return (UploadedFiles) requestMap.get(_UPLOADED_FILES_KEY);
   }