svn commit: r1334796 - /openejb/trunk/openejb/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java

[rmannibucau]

Author: rmannibucau
Date: Sun May  6 21:50:54 2012
New Revision: 1334796

URL: http://svn.apache.org/viewvc?rev=1334796&view=rev
Log:
updating cxf-rs layer after http rework

Modified:
    
openejb/trunk/openejb/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java

Modified: 
openejb/trunk/openejb/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java?rev=1334796&r1=1334795&r2=1334796&view=diff
==============================================================================
--- 
openejb/trunk/openejb/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
 (original)
+++ 
openejb/trunk/openejb/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
 Sun May  6 21:50:54 2012
@@ -29,6 +29,7 @@ import org.apache.openejb.BeanContext;
 import org.apache.openejb.Injection;
 import org.apache.openejb.loader.SystemInstance;
 import org.apache.openejb.server.httpd.HttpRequest;
+import org.apache.openejb.server.httpd.HttpRequestImpl;
 import org.apache.openejb.server.httpd.HttpResponse;
 import org.apache.openejb.server.rest.RsHttpListener;
 import org.apache.openejb.util.LogCategory;
@@ -81,11 +82,10 @@ public class CxfRsHttpListener implement
             // so without stripping the address until the context the behavior 
is weird
             // this is just a workaround waiting for something better
             @Override public String getRequestURI() {
-                try {
-                    return new URI(httpRequest.getRequestURI()).getRawPath();
-                } catch (URISyntaxException e) {
-                    return httpRequest.getRequestURI();
+                if (httpRequest instanceof HttpRequestImpl) {
+                    return ((HttpRequestImpl) httpRequest).requestRawPath();
                 }
+                return super.getRequestURI();
             }
         }, httpResponse);
     }