From 090069c8c4eee07bd4e76ac37408c712947704d8 Mon Sep 17 00:00:00 2001
From: slewis
Date: Wed, 1 Apr 2009 15:44:09 +0000
Subject: Added test for colon after query to properly address 270249

---
 .../filetransfer/httpclient/HttpClientRetrieveFileTransfer.java      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'providers/bundles')

diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient/src/org/eclipse/ecf/provider/filetransfer/httpclient/HttpClientRetrieveFileTransfer.java b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient/src/org/eclipse/ecf/provider/filetransfer/httpclient/HttpClientRetrieveFileTransfer.java
index 5ac544f3f..db0989399 100644
--- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient/src/org/eclipse/ecf/provider/filetransfer/httpclient/HttpClientRetrieveFileTransfer.java
+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient/src/org/eclipse/ecf/provider/filetransfer/httpclient/HttpClientRetrieveFileTransfer.java
@@ -173,7 +173,10 @@ public class HttpClientRetrieveFileTransfer extends AbstractRetrieveFileTransfer
 			if (colonSlashSlash < 0)
 				return "/"; //$NON-NLS-1$
 			final int colon = url.indexOf(':', colonSlashSlash + 4);
-			if (colon >= 0) {
+			// Get query start location, so that colon is not found from query
+			final int question = url.indexOf('?', colonSlashSlash + 4);
+			// Only consider colon that is before query
+			if (colon >= 0 && ((question < 0) || (colon < question))) {
 				final int nextSlash = url.indexOf('/', colonSlashSlash + 4);
 				if (nextSlash > colon)
 					return url.substring(colonSlashSlash + 1, colon) + url.substring(nextSlash);
-- 
cgit v1.2.3