[jboss-cvs] JBossRemoting/src/main/org/jboss/remoting/transport/servlet ...

[Ron Sigal]

  User: rsigal  
  Date: 07/11/01 03:19:37

  Modified:    src/main/org/jboss/remoting/transport/servlet  Tag:
                        remoting_2_x ServletServerInvoker.java
  Log:
  JBREM-838: First tries to get content-type from InvocationRequest response map.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.8.4.6   +9 -1      JBossRemoting/src/main/org/jboss/remoting/transport/servlet/ServletServerInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ServletServerInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/servlet/ServletServerInvoker.java,v
  retrieving revision 1.8.4.5
  retrieving revision 1.8.4.6
  diff -u -b -r1.8.4.5 -r1.8.4.6
  --- ServletServerInvoker.java	1 Nov 2007 02:06:01 -0000	1.8.4.5
  +++ ServletServerInvoker.java	1 Nov 2007 07:19:37 -0000	1.8.4.6
  @@ -310,7 +310,15 @@
   
            if(responseObject != null)
            {
  -            String responseContentType = responseObject == null ? requestContentType : WebUtil.getContentType(responseObject);
  +            String responseContentType = null;
  +            if (responseMap != null)
  +            {
  +               responseContentType = (String) responseMap.get("Content-Type");
  +            }
  +            if(responseContentType == null)
  +            {
  +               responseContentType = responseObject == null ? requestContentType : WebUtil.getContentType(responseObject);
  +            }
               response.setContentType(responseContentType);
               ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
               Marshaller marshaller = getMarshaller();