Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2026-04-03 00:00:04 -04:00
Code Issues Projects Releases Wiki Activity

Expanded test cases, fixed a potential NPE.

Browse Source
This commit is contained in:
Harald Kuhr
2011-04-15 17:05:47 +02:00
parent 521c4e4bbc
commit c6d6a86343
3 changed files with 157 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
servlet/src/main/java/com/twelvemonkeys/servlet/image/ImageFilter.java
View File

@@ -114,9 +114,7 @@ public abstract class ImageFilter extends GenericFilter {
// Make image available to other filters (avoid unnecessary serializing/deserializing)
imageResponse.setImage(image);
//System.out.println("Done.");
}
if (encode) {
//System.out.println("Encoding image...");
// Encode image to original response

2
servlet/src/main/java/com/twelvemonkeys/servlet/image/ImageServletResponseImpl.java
View File

@@ -189,7 +189,7 @@ class ImageServletResponseImpl extends HttpServletResponseWrapper implements Ima
String outputType = getOutputContentType();
// Force transcoding, if no other filtering is done
if (!outputType.equals(originalContentType)) {
if (outputType != null && !outputType.equals(originalContentType)) {
getImage();
}