Changeset 1614 for trunk/autoquest-httpmonitor/src/main/java/de/ugoe/cs/autoquest/httpmonitor/proxy/HttpMonitoringProxyServlet.java

Timestamp:

07/15/14 13:45:31 (10 years ago)

Author:

pharms

Message:

• bugfix and test for correct query handling

File:

• trunk/autoquest-httpmonitor/src/main/java/de/ugoe/cs/autoquest/httpmonitor/proxy/HttpMonitoringProxyServlet.java (modified) (3 diffs)

trunk/autoquest-httpmonitor/src/main/java/de/ugoe/cs/autoquest/httpmonitor/proxy/HttpMonitoringProxyServlet.java

@@ -19 +19 @@
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.nio.ByteBuffer;
@@ -99 +100 @@
     protected URI rewriteURI(HttpServletRequest request) {
         try {
+            String query = request.getQueryString();
+            
+            if (query != null) {
+                query = URLDecoder.decode(query, "UTF-8");
+            }
+            
             return new URI(request.getScheme(), null, proxiedServer, proxiedPort,
-                           request.getPathInfo(), request.getQueryString(), null);
+                           request.getPathInfo(), query, null);
         }
         catch (URISyntaxException e) {
+            Console.printerrln("could not rewrite URI: " + e);
+            Console.logException(e);
+            return null;
+        }
+        catch (UnsupportedEncodingException e) {
             Console.printerrln("could not rewrite URI: " + e);
             Console.logException(e);
@@ -365 +377 @@
                 }
             }
-            return result.toString();
+            
+            if (result.length() <= 0) {
+                return null;
+            }
+            else {
+                return result.toString();
+            }
         }