taylor 2004/07/19 22:56:47
Modified: portal/src/java/org/apache/jetspeed/capabilities/impl
CapabilityValveImpl.java
Log:
patch from Shinsuke Sugaya
http://nagoya.apache.org/jira/browse/JS2-87
CVS: ----------------------------------------------------------------------
CVS: PR:
CVS: If this change addresses a PR in the problem report tracking
CVS: database, then enter the PR number(s) here.
CVS: Obtained from:
CVS: If this change has been taken from another system, such as NCSA,
CVS: then name the system in this line, otherwise delete it.
CVS: Submitted by:
CVS: If this code has been contributed to Apache by someone else; i.e.,
CVS: they sent us a patch or a new module, then include their name/email
CVS: address here. If this is your work then delete this line.
CVS: Reviewed by:
CVS: If we are doing pre-commit code reviews and someone else has
CVS: reviewed your changes, include their name(s) here.
CVS: If you have not had it reviewed then delete this line.
Revision Changes Path
1.3 +10 -4
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/capabilities/impl/CapabilityValveImpl.java
Index: CapabilityValveImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/capabilities/impl/CapabilityValveImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CapabilityValveImpl.java 4 Jun 2004 02:38:54 -0000 1.2
+++ CapabilityValveImpl.java 20 Jul 2004 05:56:47 -0000 1.3
@@ -117,11 +117,17 @@
// Put the Media Type into the request
request.setMediaType(mediaType.getName());
-
+
// Put the Mime Type into the request
request.setMimeType(mimeType.getName());
- request.getResponse().setContentType(mimeType.getName());
-
+
+ // Put the Mime Type and Charset into the response
+ StringBuffer contentType = new StringBuffer(mimeType.getName());
+ if (encoding != null)
+ {
+ contentType.append("; charset=" + encoding);
+ }
+ request.getResponse().setContentType(contentType.toString());
}
catch (Exception e)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]