summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Pingel2012-01-25 14:05:05 (EST)
committer Steffen Pingel2012-01-25 14:05:05 (EST)
commit483900e8d5047798d11b4869c58117287e6893f6 (patch)
treea0f6267b2f482dfe37a74b3645c14617efdf48ec
parent16b461e3b6ecfaca3af1d280e242a365c44273b5 (diff)
downloadorg.eclipse.mylyn.commons-483900e8d5047798d11b4869c58117287e6893f6.zip
org.eclipse.mylyn.commons-483900e8d5047798d11b4869c58117287e6893f6.tar.gz
org.eclipse.mylyn.commons-483900e8d5047798d11b4869c58117287e6893f6.tar.bz2
RESOLVED - bug 351100: hard code localhost as proxy address
https://bugs.eclipse.org/bugs/show_bug.cgi?id=351100 Change-Id: I0e1469e8578fe0896371db569416fff0722499aa
-rw-r--r--org.eclipse.mylyn.commons.sdk.util/src/org/eclipse/mylyn/commons/sdk/util/TestProxy.java17
1 files changed, 8 insertions, 9 deletions
diff --git a/org.eclipse.mylyn.commons.sdk.util/src/org/eclipse/mylyn/commons/sdk/util/TestProxy.java b/org.eclipse.mylyn.commons.sdk.util/src/org/eclipse/mylyn/commons/sdk/util/TestProxy.java
index 915d1bb..e26c967 100644
--- a/org.eclipse.mylyn.commons.sdk.util/src/org/eclipse/mylyn/commons/sdk/util/TestProxy.java
+++ b/org.eclipse.mylyn.commons.sdk.util/src/org/eclipse/mylyn/commons/sdk/util/TestProxy.java
@@ -20,10 +20,9 @@ import java.io.InputStreamReader;
import java.io.InterruptedIOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
-import java.net.InetAddress;
+import java.net.InetSocketAddress;
import java.net.ServerSocket;
import java.net.Socket;
-import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.List;
@@ -323,13 +322,13 @@ public class TestProxy implements Runnable {
}
public String getUrl() {
-// InetSocketAddress address = new InetSocketAddress("localhost", serverSocket.getLocalPort());
-// return "http://" + address.getHostName() + ":" + address.getPort() + "/";
- try {
- return "http://" + InetAddress.getLocalHost().getHostAddress() + ":" + serverSocket.getLocalPort();
- } catch (UnknownHostException e) {
- return "http://localhost:" + serverSocket.getLocalPort();
- }
+ InetSocketAddress address = new InetSocketAddress("localhost", serverSocket.getLocalPort());
+ return "http://" + address.getHostName() + ":" + address.getPort() + "/";
+// try {
+// return "http://" + InetAddress.getLocalHost().getHostAddress() + ":" + serverSocket.getLocalPort();
+// } catch (UnknownHostException e) {
+// return "http://localhost:" + serverSocket.getLocalPort();
+// }
}
public void stop() {