[MMBASE CVS] src/org/mmbase/util Casting.java SerializableInputStream.java

[Michiel Meeuwissen]

Update of /var/cvs/src/org/mmbase/util
In directory james.mmbase.org:/tmp/cvs-serv15157

Modified Files:
        Casting.java SerializableInputStream.java 
Log Message:
added casting from inputstream -> string


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util


Index: Casting.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/Casting.java,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -b -r1.127 -r1.128
--- Casting.java        17 Apr 2009 20:19:42 -0000      1.127
+++ Casting.java        20 Apr 2009 11:22:29 -0000      1.128
@@ -16,7 +16,7 @@
  *
  * @author Michiel Meeuwissen
  * @since  MMBase-1.6
- * @version $Id: Casting.java,v 1.127 2009/04/17 20:19:42 michiel Exp $
+ * @version $Id: Casting.java,v 1.128 2009/04/20 11:22:29 michiel Exp $
  */
 
 import java.util.*;
@@ -407,6 +407,8 @@
             return escape(escaper, (String) o);
         } else if (o instanceof CharSequence) {
             return new StringWrapper((CharSequence) o, escaper);
+        } else if (o instanceof InputStream) {
+            return escape(escaper, new 
String(toSerializableInputStream(o).toByteArray()));
         } else {
             return o;
         }


Index: SerializableInputStream.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/SerializableInputStream.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- SerializableInputStream.java        17 Apr 2009 20:17:27 -0000      1.3
+++ SerializableInputStream.java        20 Apr 2009 11:22:29 -0000      1.4
@@ -20,7 +20,7 @@
  *
  * @since MMBase-1.9
  * @author Michiel Meeuwissen
- * @version $Id: SerializableInputStream.java,v 1.3 2009/04/17 20:17:27 
michiel Exp $
+ * @version $Id: SerializableInputStream.java,v 1.4 2009/04/20 11:22:29 
michiel Exp $
  * @todo IllegalStateException or so, if the inputstreas is used (already).
  */
 
@@ -84,6 +84,17 @@
     public String getName() {
         return name;
     }
+    public byte[] toByteArray() throws IOException {
+        if (wrapped.markSupported()) {
+            byte[] b =  toByteArray(wrapped);
+            wrapped.reset();
+            return b;
+        } else {
+            byte[] b =  toByteArray(wrapped);
+            wrapped = new ByteArrayInputStream(b);
+            return b;
+        }
+    }
 
     private void writeObject(java.io.ObjectOutputStream out) throws 
IOException {
         wrapped.reset();
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs