[jboss-cvs] JBossRemoting/src/main/org/jboss/remoting/transport/coyote ...
Ron Sigal
ron_sigal at yahoo.com
Wed Sep 12 23:26:51 EDT 2007
User: rsigal
Date: 07/09/12 23:26:50
Modified: src/main/org/jboss/remoting/transport/coyote Tag:
remoting_2_2_0_GA CoyoteInvoker.java
Log:
JBREM-653: versionedWrite() checks for Content-Type set in ServerInvocationHandler before guessing at Content-Type.
Revision Changes Path
No revision
No revision
1.23.2.3.2.2 +7 -2 JBossRemoting/src/main/org/jboss/remoting/transport/coyote/CoyoteInvoker.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CoyoteInvoker.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/coyote/CoyoteInvoker.java,v
retrieving revision 1.23.2.3.2.1
retrieving revision 1.23.2.3.2.2
diff -u -b -r1.23.2.3.2.1 -r1.23.2.3.2.2
--- CoyoteInvoker.java 9 May 2007 08:36:17 -0000 1.23.2.3.2.1
+++ CoyoteInvoker.java 13 Sep 2007 03:26:50 -0000 1.23.2.3.2.2
@@ -422,8 +422,13 @@
case Version.VERSION_2:
case Version.VERSION_2_2:
{
- String responseContentType = responseObject == null ? req.getContentType() : WebUtil.getContentType(responseObject);
+ String responseContentType = (String) response.get("Content-Type");
+ if(responseContentType == null)
+ {
+ responseContentType = responseObject == null ? req.getContentType() : WebUtil.getContentType(responseObject);
+ }
res.setContentType(responseContentType);
+
Marshaller marshaller = getMarshaller();
if (marshaller instanceof VersionedMarshaller)
((VersionedMarshaller) marshaller).write(responseObject, response.getOutputStream(), version);
More information about the jboss-cvs-commits
mailing list