Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/util
In directory james.mmbase.org:/tmp/cvs-serv1943
Modified Files:
Tag: MMBase-1_8
MultiPart.java
Log Message:
generalized a method a bit
See also:
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/util
Index: MultiPart.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/util/MultiPart.java,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -u -b -r1.18 -r1.18.2.1
--- MultiPart.java 28 Mar 2006 20:32:40 -0000 1.18
+++ MultiPart.java 1 Sep 2008 13:23:02 -0000 1.18.2.1
@@ -21,7 +21,7 @@
/**
* Taglib needs to read Multipart request sometimes. Functionallity is
centralized here.
* @author Michiel Meeuwissen
- * @version $Id: MultiPart.java,v 1.18 2006/03/28 20:32:40 michiel Exp $
+ * @version $Id: MultiPart.java,v 1.18.2.1 2008/09/01 13:23:02 michiel Exp $
**/
public class MultiPart {
@@ -37,11 +37,12 @@
return (ct.startsWith("multipart/"));
}
- public static MMultipartRequest getMultipartRequest(PageContext
pageContext) {
- MMultipartRequest multipartRequest =
(MMultipartRequest)pageContext.getAttribute(MULTIPARTREQUEST_KEY,
PageContext.REQUEST_SCOPE);
+
+ public static MMultipartRequest getMultipartRequest(HttpServletRequest
request, String encoding) {
+ MMultipartRequest multipartRequest = (MMultipartRequest)
request.getAttribute(MULTIPARTREQUEST_KEY);
if (multipartRequest == null) {
log.debug("Creating new MultipartRequest");
- multipartRequest = new
MMultipartRequest((HttpServletRequest)pageContext.getRequest(),
ContextContainer.getDefaultCharacterEncoding(pageContext));
+ multipartRequest = new MMultipartRequest(request, encoding);
log.debug("have it");
if (log.isDebugEnabled()) {
@@ -56,13 +57,18 @@
log.debug("not a multipart request");
}
}
- pageContext.setAttribute(MULTIPARTREQUEST_KEY, multipartRequest,
PageContext.REQUEST_SCOPE);
+ request.setAttribute(MULTIPARTREQUEST_KEY, multipartRequest);
} else {
log.debug("Found multipart request on pageContext" +
multipartRequest);
}
return multipartRequest;
}
+ public static MMultipartRequest getMultipartRequest(PageContext
pageContext) {
+ return getMultipartRequest((HttpServletRequest)
pageContext.getRequest(),
ContextContainer.getDefaultCharacterEncoding(pageContext));
+
+ }
+
static public class MMultipartRequest {
private Map parametersMap = new HashMap();
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
