You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by so...@apache.org on 2009/05/20 03:37:50 UTC
svn commit: r776515 -
/myfaces/trinidad/branches/1.2.11.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/UploadRequestManager.java
Author: sobryan
Date: Wed May 20 01:37:49 2009
New Revision: 776515
URL: http://svn.apache.org/viewvc?rev=776515&view=rev
Log:
Fixing stupid NullPointerException on file upload.. - sorry
Modified:
myfaces/trinidad/branches/1.2.11.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/UploadRequestManager.java
Modified: myfaces/trinidad/branches/1.2.11.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/UploadRequestManager.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/UploadRequestManager.java?rev=776515&r1=776514&r2=776515&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/UploadRequestManager.java (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/UploadRequestManager.java Wed May 20 01:37:49 2009
@@ -78,12 +78,14 @@
{
_LOG.fine("Switching encoding of wrapper to " + encoding);
}
+
+ Map<String, String[]> extractedParams = _getExtractedParams();
- Map<String, String[]>decodedParams = new HashMap<String, String[]>(_extractedParams.size());
+ Map<String, String[]>decodedParams = new HashMap<String, String[]>(extractedParams.size());
byte[] buffer = new byte[256];
- for(Map.Entry<String, String[]> entry : _extractedParams.entrySet())
+ for(Map.Entry<String, String[]> entry : extractedParams.entrySet())
{
String key = entry.getKey();
key = CaboHttpUtils.decodeRequestParameter(key, encoding, buffer);
@@ -120,17 +122,10 @@
// can log a proper warning
_parametersRetrieved = true;
- if(_extractedParams == null)
- {
- Map<String, String[]> m = new HashMap<String, String[]>(_requestParams);
- m.putAll(_params);
- _extractedParams = Collections.unmodifiableMap(m);
- }
-
if (_extractedAndDecodedParams != null)
return _extractedAndDecodedParams;
- return _extractedParams;
+ return _getExtractedParams();
}
public Enumeration<String> getParameterNames()
@@ -167,6 +162,18 @@
_requestParams = req.getParameterMap();
_encoding = req.getCharacterEncoding();
}
+
+ private Map<String, String[]> _getExtractedParams()
+ {
+ if(_extractedParams == null)
+ {
+ Map<String, String[]> m = new HashMap<String, String[]>(_requestParams);
+ m.putAll(_params);
+ _extractedParams = Collections.unmodifiableMap(m);
+ }
+
+ return _extractedParams;
+ }
private String[] _getParameterValues(String param)
{