svn commit: r892262 - /sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverWebConsolePlugin.java

[fmeschbe]

Author: fmeschbe
Date: Fri Dec 18 14:16:01 2009
New Revision: 892262

URL: http://svn.apache.org/viewvc?rev=892262&view=rev
Log:
SLING-1218 use HttpClient URI class also for the test functionality of the web 
console plugin

Modified:
    
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverWebConsolePlugin.java

Modified: 
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverWebConsolePlugin.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverWebConsolePlugin.java?rev=892262&r1=892261&r2=892262&view=diff
==============================================================================
--- 
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverWebConsolePlugin.java
 (original)
+++ 
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverWebConsolePlugin.java
 Fri Dec 18 14:16:01 2009
@@ -20,8 +20,6 @@
 
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Dictionary;
@@ -34,6 +32,8 @@
 import javax.servlet.http.HttpServletRequestWrapper;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.httpclient.URI;
+import org.apache.commons.httpclient.URIException;
 import org.apache.felix.webconsole.AbstractWebConsolePlugin;
 import org.apache.felix.webconsole.ConfigurationPrinter;
 import org.apache.felix.webconsole.WebConsoleConstants;
@@ -337,9 +337,9 @@
         private final URI uri;
 
         public ResolverRequest(HttpServletRequest request, String uriString)
-                throws URISyntaxException {
+                throws URIException {
             super(request);
-            uri = new URI(uriString);
+            uri = new URI(uriString, false);
         }
 
         @Override
@@ -349,7 +349,11 @@
 
         @Override
         public String getServerName() {
-            return uri.getHost();
+            try {
+                return uri.getHost();
+            } catch (URIException ue) {
+                return null;
+            }
         }
 
         @Override
@@ -359,7 +363,11 @@
 
         @Override
         public String getPathInfo() {
-            return uri.getPath();
+            try {
+                return uri.getPath();
+            } catch (URIException ue) {
+                return "";
+            }
         }
     }