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

[Tom Elrod]

  User: telrod  
  Date: 07/01/18 02:37:29

  Modified:    src/main/org/jboss/remoting/transport/servlet  Tag:
                        remoting_2_x ServletServerInvoker.java
  Log:
  JBREM-671 - fixed so leasing will work again when using servlet invoker.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.8.4.2   +14 -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.1
  retrieving revision 1.8.4.2
  diff -u -b -r1.8.4.1 -r1.8.4.2
  --- ServletServerInvoker.java	13 Jan 2007 12:42:35 -0000	1.8.4.1
  +++ ServletServerInvoker.java	18 Jan 2007 07:37:29 -0000	1.8.4.2
  @@ -45,6 +45,8 @@
   import java.util.Enumeration;
   import java.util.HashMap;
   import java.util.Map;
  +import java.util.Set;
  +import java.util.Iterator;
   
   /**
    * The servlet based server invoker that receives the original http request
  @@ -239,13 +241,24 @@
            Map responseMap = invocationRequest.getReturnPayload();
            if(responseMap != null)
            {
  -            Integer handlerStatus = (Integer) responseMap.get(HTTPMetadataConstants.RESPONSE_CODE);
  +            Integer handlerStatus = (Integer) responseMap.remove(HTTPMetadataConstants.RESPONSE_CODE);
               if(handlerStatus != null)
               {
                  status = handlerStatus.intValue();
               }
  +
  +            // add any response map headers
  +            Set entries = responseMap.entrySet();
  +            Iterator itr = entries.iterator();
  +            while(itr.hasNext())
  +            {
  +               Map.Entry entry = (Map.Entry)itr.next();
  +               response.addHeader(entry.getKey().toString(), entry.getValue().toString());
  +            }
            }
   
  +
  +
            // can't set message anymore as is depricated
            response.setStatus(status);