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:00:57 UTC
svn commit: r690471 - in
/myfaces/trinidad/branches/1.2.8.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload:
FileUploadConfiguratorImpl.java UploadedFiles.java
Author: matzew
Date: Fri Aug 29 23:00:56 2008
New Revision: 690471
URL: http://svn.apache.org/viewvc?rev=690471&view=rev
Log:
TRINIDAD-1211 - FileUploadConfiguratorImpl should call UploadedFiles.dispose() in endRequest()
calling dispose() only (for now) in non-portlet env.
TRINIDAD-1211 has a comment regarding JSR 301
Modified:
myfaces/trinidad/branches/1.2.8.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/FileUploadConfiguratorImpl.java
myfaces/trinidad/branches/1.2.8.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/UploadedFiles.java
Modified: myfaces/trinidad/branches/1.2.8.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/FileUploadConfiguratorImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.8.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/FileUploadConfiguratorImpl.java?rev=690471&r1=690470&r2=690471&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.8.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/FileUploadConfiguratorImpl.java (original)
+++ myfaces/trinidad/branches/1.2.8.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/FileUploadConfiguratorImpl.java Fri Aug 29 23:00:56 2008
@@ -171,6 +171,20 @@
return externalContext;
}
+
+ /* (non-Javadoc)
+ * @see org.apache.myfaces.trinidad.config.Configurator#beginRequest(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)
@@ -288,4 +302,4 @@
static private final String _PARAMS = FileUploadConfiguratorImpl.class.getName()+".PARAMS";
private long _maxAllowedBytes = 1L << 27;
-}
\ No newline at end of file
+}
Modified: myfaces/trinidad/branches/1.2.8.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/UploadedFiles.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.8.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/UploadedFiles.java?rev=690471&r1=690470&r2=690471&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.8.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/UploadedFiles.java (original)
+++ myfaces/trinidad/branches/1.2.8.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/UploadedFiles.java Fri Aug 29 23:00:56 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);
}