You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2015/04/07 13:01:20 UTC

wicket git commit: WICKET-5873 Resources served by Wicket are not compressable

Repository: wicket
Updated Branches:
  refs/heads/wicket-6.x 142484539 -> c31a65f31


WICKET-5873 Resources served by Wicket are not compressable


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c31a65f3
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c31a65f3
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c31a65f3

Branch: refs/heads/wicket-6.x
Commit: c31a65f31463fb2238896990a052a8da930d2bc9
Parents: 1424845
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Apr 7 14:00:55 2015 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Apr 7 14:00:55 2015 +0300

----------------------------------------------------------------------
 .../org/apache/wicket/request/resource/AbstractResource.java    | 5 ++---
 .../apache/wicket/protocol/http/ResponseIOExceptionTest.java    | 5 +++++
 2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/c31a65f3/wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java
index 3ec5a7f..dadb978 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java
@@ -656,9 +656,6 @@ public abstract class AbstractResource implements IResource
 					webResponse.addHeader(name, value);
 				}
 			}
-
-			// 6. Flush the response
-			flushResponseAfterHeaders(webResponse);
 		}
 	}
 
@@ -699,7 +696,9 @@ public abstract class AbstractResource implements IResource
 		 *            request attributes
 		 * @param stream
 		 *            input stream
+		 * @deprecated Not used since 6.20.0. Removed in 7.0.0
 		 */
+		@Deprecated
 		protected final void writeStream(Attributes attributes, InputStream stream) throws IOException
 		{
 			final Response response = attributes.getResponse();

http://git-wip-us.apache.org/repos/asf/wicket/blob/c31a65f3/wicket-core/src/test/java/org/apache/wicket/protocol/http/ResponseIOExceptionTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/ResponseIOExceptionTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/ResponseIOExceptionTest.java
index 426d209..26c6949 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/ResponseIOExceptionTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/ResponseIOExceptionTest.java
@@ -120,6 +120,11 @@ public class ResponseIOExceptionTest extends Assert
 		@Override
 		public void write(byte[] array)
 		{
+			write(array, 0, array.length);
+		}
+
+		public void write(byte[] array, int offset, int length)
+		{
 			throw new ResponseIOException(new SocketException(
 				"Connection reset by peer: socket write error"));
 		}