Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib
In directory james.mmbase.org:/tmp/cvs-serv20233
Modified Files:
WriteTag.java ContextTag.java
Log Message:
MMB-1810
See also:
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib
See also: http://www.mmbase.org/jira/browse/MMB-1810
Index: WriteTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/WriteTag.java,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- WriteTag.java 17 Mar 2008 16:18:15 -0000 1.52
+++ WriteTag.java 24 Apr 2009 19:58:44 -0000 1.53
@@ -31,7 +31,7 @@
* of a 'Writer' tag.
*
* @author Michiel Meeuwissen
- * @version $Id: WriteTag.java,v 1.52 2008/03/17 16:18:15 michiel Exp $
+ * @version $Id: WriteTag.java,v 1.53 2009/04/24 19:58:44 michiel Exp $
*/
public class WriteTag extends ContextReferrerTag implements Writer,
FunctionContainerReferrer {
@@ -105,7 +105,7 @@
}
if (helper.getVartype() == WriterHelper.TYPE_BYTES) {
- return getContextTag().getBytes(getReferid()); // a hack..
+ //return getContextTag().getBytes(getReferid()); // a hack..
}
Object res = getObject(getReferid());
if (log.isDebugEnabled()) {
Index: ContextTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/ContextTag.java,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -b -r1.96 -r1.97
--- ContextTag.java 17 Apr 2009 15:42:13 -0000 1.96
+++ ContextTag.java 24 Apr 2009 19:58:44 -0000 1.97
@@ -45,7 +45,7 @@
* </p>
*
* @author Michiel Meeuwissen
- * @version $Id: ContextTag.java,v 1.96 2009/04/17 15:42:13 michiel Exp $
+ * @version $Id: ContextTag.java,v 1.97 2009/04/24 19:58:44 michiel Exp $
* @see ImportTag
* @see WriteTag
*/
@@ -182,7 +182,7 @@
PageContextContainer prevPc = (PageContextContainer)
prevParent;
if (((PageContextBacking)
prevPc.getBacking()).getPageContext() != pageContext) {
ServletRequest prevReq = unwrap(((PageContextBacking)
prevPc.getBacking()).getPageContext().getRequest());
- if (prevReq != unwrap(pageContext.getRequest())) {
+ if (prevReq != null && prevReq !=
unwrap(pageContext.getRequest())) {
log.warn("found a pagecontext container for a
different request (" + prevReq + " != '" + pageContext.getRequest() + "').
Repairing");
} else {
log.debug("found a pagecontext container for a
different pageContext. Repairing");
@@ -330,17 +330,10 @@
}
- /**
- * hmm.. This kind of stuf must move to ImportTag, I think.
- */
- public byte[] getBytes(String key) throws JspTagException {
- return MultiPart.getMultipartRequest(pageContext).getBytes(key);
-
- }
- public org.apache.commons.fileupload.FileItem getFileItem(String key)
throws JspTagException {
- return MultiPart.getMultipartRequest(pageContext).getFileItem(key);
+ public org.mmbase.util.SerializableInputStream getInputStream(String key)
throws JspTagException {
+ return MultiPart.getMultipartRequest(pageContext).getInputStream(key);
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
