From f89d4eb51d998a6e32946804799225d89b91a465 Mon Sep 17 00:00:00 2001
From: reger <reger18@arcor.de>
Date: Sun, 17 Jul 2016 04:17:01 +0200
Subject: [PATCH] fix MultiProtocolURL init (assign of host) for urls with '/'
 in query part + add to test case

---
 source/net/yacy/cora/document/id/MultiProtocolURL.java    | 8 +++++++-
 .../net/yacy/cora/document/id/MultiProtocolURLTest.java   | 3 +++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/source/net/yacy/cora/document/id/MultiProtocolURL.java b/source/net/yacy/cora/document/id/MultiProtocolURL.java
index 640bc5451..21569c0d8 100644
--- a/source/net/yacy/cora/document/id/MultiProtocolURL.java
+++ b/source/net/yacy/cora/document/id/MultiProtocolURL.java
@@ -216,7 +216,13 @@ public class MultiProtocolURL implements Serializable, Comparable<MultiProtocolU
         if (!this.protocol.equals("file") && url.substring(p + 1, p + 3).equals("//")) {
             // identify host, userInfo and file for http and ftp protocol
             int q = url.indexOf('/', p + 3);
-            if (q < 0) q = url.indexOf("?", p + 3); // check for www.test.com?searchpart
+            if (q < 0) { // check for www.test.com?searchpart
+                q = url.indexOf("?", p + 3);
+            } else { // check that '/' was not in searchpart (example http://test.com?data=1/2/3)
+                if (url.lastIndexOf("?",q) >= 0) {
+                    q = url.lastIndexOf("?",q);
+                }
+            }
             int r;
             if (q < 0) {
                 if ((r = url.indexOf('@', p + 3)) < 0) {
diff --git a/test/java/net/yacy/cora/document/id/MultiProtocolURLTest.java b/test/java/net/yacy/cora/document/id/MultiProtocolURLTest.java
index 9ada0285c..c8d012a7f 100644
--- a/test/java/net/yacy/cora/document/id/MultiProtocolURLTest.java
+++ b/test/java/net/yacy/cora/document/id/MultiProtocolURLTest.java
@@ -127,6 +127,9 @@ public class MultiProtocolURLTest {
             new String[]{"http://www.yacy.net?query=test", "www.yacy.net"},
             new String[]{"http://www.yacy.net:?query=test", "www.yacy.net"},
             new String[]{"//www.yacy.net:?query=test", "www.yacy.net"},
+            
+            new String[]{"http://www.yacy.net?data=1/2/3", "www.yacy.net"},
+            new String[]{"http://www.yacy.net?url=http://test.com", "www.yacy.net"}
         };
 
         for (int i = 0; i < testStrings.length; i++) {