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/09/01 19:34:19 UTC

svn commit: r691020 - /myfaces/trinidad/branches/1.2.9.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/FileUploadConfiguratorImpl.java

Author: matzew
Date: Mon Sep  1 10:34:18 2008
New Revision: 691020

URL: http://svn.apache.org/viewvc?rev=691020&view=rev
Log:
fixed NPE

Modified:
    myfaces/trinidad/branches/1.2.9.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/FileUploadConfiguratorImpl.java

Modified: myfaces/trinidad/branches/1.2.9.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.9.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/FileUploadConfiguratorImpl.java?rev=691020&r1=691019&r2=691020&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.9.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/FileUploadConfiguratorImpl.java (original)
+++ myfaces/trinidad/branches/1.2.9.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/FileUploadConfiguratorImpl.java Mon Sep  1 10:34:18 2008
@@ -173,7 +173,7 @@
   }
   
   /* (non-Javadoc)
-   * @see org.apache.myfaces.trinidad.config.Configurator#beginRequest(javax.faces.context.ExternalContext)
+   * @see org.apache.myfaces.trinidad.config.Configurator#endRequest(javax.faces.context.ExternalContext)
    */
   @Override
   public void endRequest(ExternalContext externalContext)
@@ -182,7 +182,8 @@
     if(!ExternalContextUtils.isPortlet(externalContext))
     {
       UploadedFiles files = UploadedFiles.getUploadedFiles(externalContext);
-      files.dispose();
+      if(files != null)
+        files.dispose();
     }
   }