You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by to...@apache.org on 2006/02/16 16:20:01 UTC
svn commit: r378275 -
/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/ExtensionsFilter.java
Author: tomsp
Date: Thu Feb 16 07:19:59 2006
New Revision: 378275
URL: http://svn.apache.org/viewcvs?rev=378275&view=rev
Log:
fixed content type bug
Modified:
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/ExtensionsFilter.java
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/ExtensionsFilter.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/ExtensionsFilter.java?rev=378275&r1=378274&r2=378275&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/ExtensionsFilter.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/ExtensionsFilter.java Thu Feb 16 07:19:59 2006
@@ -101,7 +101,7 @@
return;
}
- HttpServletResponse httpResponse = (HttpServletResponse) response;
+ HttpServletResponse httpResponse = (HttpServletResponse) response;
HttpServletRequest httpRequest = (HttpServletRequest) request;
HttpServletRequest extendedRequest = httpRequest;
@@ -129,37 +129,45 @@
HttpServletResponse servletResponse = (HttpServletResponse)response;
// only parse HTML responses
- if (extendedResponse.getContentType() != null && extendedResponse.getContentType().startsWith("text/html"))
+ if (extendedResponse.getContentType() != null && isValidContentType(extendedResponse.getContentType()))
{
- addResource.parseResponse(extendedRequest, extendedResponse.toString(),
- servletResponse);
-
- addResource.writeMyFacesJavascriptBeforeBodyEnd(extendedRequest,
- servletResponse);
-
- if( ! addResource.hasHeaderBeginInfos(extendedRequest) ){
- // writes the response if no header info is needed
- addResource.writeResponse(extendedRequest, servletResponse);
- return;
- }
-
- // Some headerInfo has to be added
- addResource.writeWithFullHeader(extendedRequest, servletResponse);
-
- // writes the response
- addResource.writeResponse(extendedRequest, servletResponse);
+ addResource.parseResponse(extendedRequest, extendedResponse.toString(),
+ servletResponse);
+
+ addResource.writeMyFacesJavascriptBeforeBodyEnd(extendedRequest,
+ servletResponse);
+
+ if( ! addResource.hasHeaderBeginInfos(extendedRequest) ){
+ // writes the response if no header info is needed
+ addResource.writeResponse(extendedRequest, servletResponse);
+ return;
+ }
+
+ // Some headerInfo has to be added
+ addResource.writeWithFullHeader(extendedRequest, servletResponse);
+
+ // writes the response
+ addResource.writeResponse(extendedRequest, servletResponse);
}
else
{
- servletResponse.getWriter().write(extendedResponse.toString());
+ servletResponse.getWriter().write(extendedResponse.toString());
}
}
+ public boolean isValidContentType(String contentType)
+ {
+ return contentType.startsWith("text/html") ||
+ contentType.startsWith("text/xml") ||
+ contentType.startsWith("application/xhtml+xml") ||
+ contentType.startsWith("application/xml");
+ }
+
/**
* Destroy method for this filter
*/
public void destroy() {
- // NoOp
+ // NoOp
}