Author: mgrigorov
Date: Wed Jul 27 14:37:05 2011
New Revision: 1151482
URL: http://svn.apache.org/viewvc?rev=1151482&view=rev
Log:
WICKET-3935 DynamicImageResource shouldn't be that lazy
Added:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/resource/DynamicImageResourceTest.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/DynamicImageResource.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/DynamicImageResource.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/DynamicImageResource.java?rev=1151482&r1=1151481&r2=1151482&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/DynamicImageResource.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/DynamicImageResource.java
Wed Jul 27 14:37:05 2011
@@ -21,6 +21,7 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletResponse;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.util.lang.Args;
@@ -150,15 +151,22 @@ public abstract class DynamicImageResour
response.setContentDisposition(ContentDisposition.INLINE);
- response.setWriteCallback(new WriteCallback()
+ final byte[] imageData = getImageData(attributes);
+ if (imageData == null)
{
- @Override
- public void writeData(final Attributes
attributes)
+
response.setError(HttpServletResponse.SC_NOT_FOUND);
+ }
+ else
+ {
+ response.setWriteCallback(new WriteCallback()
{
-
attributes.getResponse().write(getImageData(attributes));
- }
- });
-
+ @Override
+ public void writeData(final Attributes
attributes)
+ {
+
attributes.getResponse().write(imageData);
+ }
+ });
+ }
configureResponse(response, attributes);
}
Added:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/resource/DynamicImageResourceTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/resource/DynamicImageResourceTest.java?rev=1151482&view=auto
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/resource/DynamicImageResourceTest.java
(added)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/resource/DynamicImageResourceTest.java
Wed Jul 27 14:37:05 2011
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.request.resource;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.wicket.WicketTestCase;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * Tests for {@link DynamicImageResource}
+ */
+public class DynamicImageResourceTest extends WicketTestCase
+{
+
+ /**
+ * https://issues.apache.org/jira/browse/WICKET-3935
+ */
+ @Test
+ public void emptyImageDataIs404()
+ {
+ DynamicImageResource resource = new DynamicImageResource()
+ {
+ @Override
+ protected byte[] getImageData(Attributes attributes)
+ {
+ return null;
+ }
+ };
+
+ tester.startResource(resource);
+ assertEquals(HttpServletResponse.SC_NOT_FOUND,
tester.getLastResponse().getStatus());
+ }
+
+ /**
+ * https://issues.apache.org/jira/browse/WICKET-3935
+ */
+ @Test
+ public void nonEmptyImageDataIs200()
+ {
+ final byte[] expected = new byte[] { 1, 2, 3 };
+
+ DynamicImageResource resource = new DynamicImageResource()
+ {
+ @Override
+ protected byte[] getImageData(Attributes attributes)
+ {
+ return expected;
+ }
+ };
+
+ tester.startResource(resource);
+ assertEquals(HttpServletResponse.SC_OK,
tester.getLastResponse().getStatus());
+ Assert.assertArrayEquals(expected,
tester.getLastResponse().getBinaryContent());
+ }
+}
