[openejb-scm] openejb/modules/core/src/java/org/openejb/server/httpd HttpRequest.java HttpRequestImpl.java

[dblevins]

dblevins    2005/03/15 21:24:15

  Modified:    modules/core/src/java/org/openejb/server/httpd
                        HttpRequest.java HttpRequestImpl.java
  Log:

  Fixed URI issues, MessageContext demarshalling issues and classloading issues
  
  Revision  Changes    Path
  1.3       +2 -2      
openejb/modules/core/src/java/org/openejb/server/httpd/HttpRequest.java
  
  Index: HttpRequest.java
  ===================================================================
  RCS file: 
/scm/openejb/openejb/modules/core/src/java/org/openejb/server/httpd/HttpRequest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- HttpRequest.java  9 Mar 2005 06:17:16 -0000       1.2
  +++ HttpRequest.java  16 Mar 2005 02:24:15 -0000      1.3
  @@ -179,7 +179,7 @@
       /** Gets the URI for the current URL page.
        * @return The URI
        */ 
  -    public java.net.URL getURI();
  +    public java.net.URI getURI();
   
       int getContentLength();
   
  
  
  
  1.6       +8 -6      
openejb/modules/core/src/java/org/openejb/server/httpd/HttpRequestImpl.java
  
  Index: HttpRequestImpl.java
  ===================================================================
  RCS file: 
/scm/openejb/openejb/modules/core/src/java/org/openejb/server/httpd/HttpRequestImpl.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- HttpRequestImpl.java      9 Mar 2005 06:17:16 -0000       1.5
  +++ HttpRequestImpl.java      16 Mar 2005 02:24:15 -0000      1.6
  @@ -47,6 +47,8 @@
   import java.io.*;
   import java.net.URL;
   import java.net.URLDecoder;
  +import java.net.URI;
  +import java.net.URISyntaxException;
   import java.util.HashMap;
   import java.util.Iterator;
   import java.util.StringTokenizer;
  @@ -74,7 +76,7 @@
       /**
        * 5.1.2    Request-URI
        */
  -    private URL uri;
  +    private URI uri;
       /**
        * the headers for this page
        */
  @@ -158,7 +160,7 @@
        *
        * @return The URI
        */
  -    public URL getURI() {
  +    public URI getURI() {
           return uri;
       }
   
  @@ -260,9 +262,9 @@
           }
   
           try {
  -            uri = new URL("http", "localhost", token);
  -        } catch (java.net.MalformedURLException e) {
  -            throw new IOException("Malformed URL :" + token + " Exception: " 
+ e.getMessage());
  +            uri = new URI(token);
  +        } catch (URISyntaxException e) {
  +            throw new IOException("Malformed URI :" + token + " Exception: " 
+ e.getMessage());
           }
   
           parseQueryParams(uri.getQuery());