svn commit: r1221183 - /wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java

[mgrigorov]

Author: mgrigorov
Date: Tue Dec 20 10:15:05 2011
New Revision: 1221183

URL: http://svn.apache.org/viewvc?rev=1221183&view=rev
Log:
WICKET-4306
Content type overriding in PackageResource


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=1221183&r1=1221182&r2=1221183&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
 Tue Dec 20 10:15:05 2011
@@ -254,15 +254,13 @@ public class PackageResource extends Abs
                                return sendResourceError(resourceResponse, 
HttpServletResponse.SC_NOT_FOUND,
                                        "Unable to find resource");
 
-                       final String contentType;
-                       if (Application.exists())
+                       String contentType = resourceStream.getContentType();
+
+                       if (contentType == null && Application.exists())
                        {
                                contentType = 
Application.get().getMimeType(path);
                        }
-                       else
-                       {
-                               contentType = resourceStream.getContentType();
-                       }
+
                        // set Content-Type (may be null)
                        resourceResponse.setContentType(contentType);