tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp WarpEngine.java
Date Sat, 02 Mar 2002 00:13:01 GMT
remm        02/03/01 16:13:01

  Modified:    catalina/src/share/org/apache/catalina/connector/warp Tag:
                        tomcat_40_branch WarpEngine.java
  Log:
  - Update JK and webapp.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.11.2.1  +12 -5     jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp/Attic/WarpEngine.java
  
  Index: WarpEngine.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp/Attic/WarpEngine.java,v
  retrieving revision 1.11
  retrieving revision 1.11.2.1
  diff -u -r1.11 -r1.11.2.1
  --- WarpEngine.java	20 Jul 2001 00:01:06 -0000	1.11
  +++ WarpEngine.java	2 Mar 2002 00:13:01 -0000	1.11.2.1
  @@ -69,12 +69,19 @@
       public Container map(Request request, boolean update) {
           this.log("Mapping request");
           if (request instanceof WarpRequest) {
  -            WarpRequest wreq=(WarpRequest)request;
  -            Host host=wreq.getHost();
  +            WarpRequest wreq = (WarpRequest)request;
  +            Host host = wreq.getHost();
               if (update) {
  -                request.setServerName(host.getName());
  +                if (request.getRequest().getServerName() == null) {
  +                    request.setServerName(host.getName());
  +                } else {
  +                    request.setServerName
  +                        (request.getRequest().getServerName());
  +                }
               }
  -            return(host);
  -        } else return(super.map(request,update));
  +            return (host);
  +        } else {
  +            return (super.map(request,update));
  +        }
       }
   }
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message