You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jc...@apache.org on 2010/05/07 14:04:08 UTC

svn commit: r942055 - /wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/upload/MultipartFormInputStream.java

Author: jcompagner
Date: Fri May  7 12:04:07 2010
New Revision: 942055

URL: http://svn.apache.org/viewvc?rev=942055&view=rev
Log:
fix the tests

Modified:
    wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/upload/MultipartFormInputStream.java

Modified: wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/upload/MultipartFormInputStream.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/upload/MultipartFormInputStream.java?rev=942055&r1=942054&r2=942055&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/upload/MultipartFormInputStream.java (original)
+++ wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/upload/MultipartFormInputStream.java Fri May  7 12:04:07 2010
@@ -655,7 +655,7 @@ public class MultipartFormInputStream
 	public int readBodyData(OutputStream output) throws MalformedStreamException, IOException
 	{
 		final InputStream istream = newInputStream();
-		return (int)Streams.copy(istream, output);
+		return Streams.copy(istream, output == null ? new NoopOutputStream() : output);
 	}
 
 	/**
@@ -1184,6 +1184,34 @@ public class MultipartFormInputStream
 		}
 	}
 
+	private final static class NoopOutputStream extends OutputStream
+	{
+		@Override
+		public void close()
+		{
+		}
+
+		@Override
+		public void flush()
+		{
+		}
+
+		@Override
+		public void write(byte[] b)
+		{
+		}
+
+		@Override
+		public void write(byte[] b, int i, int l)
+		{
+		}
+
+		@Override
+		public void write(int b)
+		{
+		}
+	}
+
 	// ------------------------------------------------------ Debugging methods