Author: mgrigorov
Date: Fri May 6 13:52:21 2011
New Revision: 1100217
URL: http://svn.apache.org/viewvc?rev=1100217&view=rev
Log:
WICKET-3675 Usage of JavaScriptCompressor by resources other than
PackageTextTemplates is lost!
WICKET-3674 Provide an interface to allow css resources to be compressed like
javascript resources
First process the reource's bytes then set the Content-Length.
Actually use the processed bytes.
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java?rev=1100217&r1=1100216&r2=1100217&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java
Fri May 6 13:52:21 2011
@@ -225,8 +225,10 @@ public class PackageResource extends Abs
resourceStream.close();
}
+ final byte[] processed = processResponse(bytes);
+
// send Content-Length header
- resourceResponse.setContentLength(bytes.length);
+
resourceResponse.setContentLength(processed.length);
// send response body with resource data
resourceResponse.setWriteCallback(new
WriteCallback()
@@ -234,8 +236,7 @@ public class PackageResource extends Abs
@Override
public void writeData(Attributes
attributes)
{
- byte[] processed =
processResponse(bytes);
-
attributes.getResponse().write(bytes);
+
attributes.getResponse().write(processed);
}
});
}
