cziegeler    2002/12/05 06:18:31

  Modified:    src/java/org/apache/cocoon/environment/http Tag:
                        cocoon_2_0_3_branch HttpRequest.java
                        HttpContext.java
  Log:
  Minor performance improvement and securing instance variables
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.6.2.6   +3 -1      
xml-cocoon2/src/java/org/apache/cocoon/environment/http/HttpRequest.java
  
  Index: HttpRequest.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/http/HttpRequest.java,v
  retrieving revision 1.6.2.5
  retrieving revision 1.6.2.6
  diff -u -r1.6.2.5 -r1.6.2.6
  --- HttpRequest.java  5 Dec 2002 14:07:56 -0000       1.6.2.5
  +++ HttpRequest.java  5 Dec 2002 14:18:30 -0000       1.6.2.6
  @@ -305,6 +305,7 @@
       }
   
       private String decode(String str) {
  +        if (str == null) return null;
           try {
               if (this.container_encoding == null)
                   this.container_encoding = "ISO-8859-1";
  @@ -321,6 +322,7 @@
   
       public String[] getParameterValues(String name) {
           String[] values = this.req.getParameterValues(name);
  +        if (values == null) return null;
           if (this.form_encoding == null) {
               return values;
           }
  
  
  
  1.7.2.3   +2 -2      
xml-cocoon2/src/java/org/apache/cocoon/environment/http/HttpContext.java
  
  Index: HttpContext.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/http/HttpContext.java,v
  retrieving revision 1.7.2.2
  retrieving revision 1.7.2.3
  diff -u -r1.7.2.2 -r1.7.2.3
  --- HttpContext.java  5 Dec 2002 14:07:56 -0000       1.7.2.2
  +++ HttpContext.java  5 Dec 2002 14:18:30 -0000       1.7.2.3
  @@ -111,7 +111,7 @@
                   try {
                   value = this.servletContext.getResource("/WEB-INF").toString();
                   } catch (MalformedURLException mue) {
  -                    throw new CascadingRuntimeException("Cannot determine the base 
URL", mue);
  +                    throw new CascadingRuntimeException("Cannot determine the base 
URL for " + path, mue);
                   }
                   value = value.substring(0,value.length()-"WEB-INF".length());
               }
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     [EMAIL PROTECTED]
To unsubscribe, e-mail:          [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to