You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2009/01/23 06:19:35 UTC
svn commit: r736925 -
/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java
Author: lu4242
Date: Thu Jan 22 21:19:35 2009
New Revision: 736925
URL: http://svn.apache.org/viewvc?rev=736925&view=rev
Log:
use ExternalContext.getMimeType to resolve contentType if is null
Modified:
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java?rev=736925&r1=736924&r2=736925&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java Thu Jan 22 21:19:35 2009
@@ -73,6 +73,12 @@
String contentType)
{
Resource resource = null;
+
+ if (contentType == null)
+ {
+ //Resolve contentType using ExternalContext.getMimeType
+ contentType = FacesContext.getCurrentInstance().getExternalContext().getMimeType(resourceName);
+ }
for (ResourceLoader loader : getResourceHandlerSupport()
.getResourceLoaders())