fix: fix proxy handling

drallieiv · May 22, 2017 · a67155b · a67155b
1 parent 4fe1ec2
commit a67155b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/KinanCity-core/src/main/java/com/kinancity/core/proxy/impl/HttpProxy.java b/KinanCity-core/src/main/java/com/kinancity/core/proxy/impl/HttpProxy.java
@@ -141,7 +141,7 @@ public static HttpProxy fromURI(String uri) {
 				protocol = "http";
 				port = DEFAULT_PORT;
 			} else {
-				if (port < 0) {
+				if (protocol == null) {
 					// Guess port from Protocol
 					for (Entry<String, Integer> entry : DEFAULT_MAPPING.entrySet()) {
 						if (entry.getValue() == port) {
@@ -152,7 +152,7 @@ public static HttpProxy fromURI(String uri) {
 					if (protocol == null) {
 						protocol = DEFAULT_PROTOCOL;
 					}
-				} else if (protocol == null) {
+				} else if (port < 0) {
 					// Guess protocol from port
 					if (DEFAULT_MAPPING.get(protocol) != null) {
 						port = DEFAULT_MAPPING.get(protocol);