diff options
| author | jungwook.ryu <jungwook.ryu@samsung.com> | 2014-09-07 16:39:50 +0900 |
|---|---|---|
| committer | jungwook.ryu <jungwook.ryu@samsung.com> | 2014-09-12 18:36:53 +0900 |
| commit | 028040109f8b51618124fd33dfca4894492478a6 (patch) | |
| tree | e640a4fb3a159b605e2b3c62a36d7da54981e75d | |
| parent | 5d4eb7c36a537711e81304760b78649b12fc07b7 (diff) | |
| download | dynamic-analysis-ide-eplugin-028040109f8b51618124fd33dfca4894492478a6.tar.gz dynamic-analysis-ide-eplugin-028040109f8b51618124fd33dfca4894492478a6.tar.bz2 dynamic-analysis-ide-eplugin-028040109f8b51618124fd33dfca4894492478a6.zip | |
Fix communication with DA tool proxy network environment
Change-Id: I9a7018bd3d4f75428c84078ab91dbc1507e51fc3
Signed-off-by: jungwook.ryu <jungwook.ryu@samsung.com>
| -rw-r--r-- | org.tizen.dynamicanalysis.ide.eplugin/src/org/tizen/dynamicanalysis/ide/eplugin/communication/DAServerManager.java | 9 | ||||
| -rw-r--r-- | package/changelog | 3 | ||||
| -rw-r--r-- | package/pkginfo.manifest | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/org.tizen.dynamicanalysis.ide.eplugin/src/org/tizen/dynamicanalysis/ide/eplugin/communication/DAServerManager.java b/org.tizen.dynamicanalysis.ide.eplugin/src/org/tizen/dynamicanalysis/ide/eplugin/communication/DAServerManager.java index 404361a..f65990b 100644 --- a/org.tizen.dynamicanalysis.ide.eplugin/src/org/tizen/dynamicanalysis/ide/eplugin/communication/DAServerManager.java +++ b/org.tizen.dynamicanalysis.ide.eplugin/src/org/tizen/dynamicanalysis/ide/eplugin/communication/DAServerManager.java @@ -34,6 +34,9 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStreamWriter; import java.io.RandomAccessFile; +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.net.Proxy; import java.net.Socket; import java.net.UnknownHostException; import java.nio.channels.FileChannel; @@ -62,8 +65,6 @@ public class DAServerManager extends Thread { private String reservedExecutablePath; //$NON-NLS-1$ private List<String> reservedLocalPackagePathList; //$NON-NLS-1$ - private String LOCAL_HOST = "localhost"; //$NON-NLS-1$ - private final String IDE_DA_COMMUNICATION_TYPE_1 = "STATUS"; //$NON-NLS-1$ private final String IDE_DA_COMMUNICATION_TYPE_2 = "RUN"; //$NON-NLS-1$ private final String IDE_DA_COMMUNICATION_TYPE_3 = "SOURCE"; //$NON-NLS-1$ @@ -293,7 +294,9 @@ public class DAServerManager extends Thread { private boolean setServerSocket() { try { - ideClientSocket = new Socket(LOCAL_HOST, serverPort); + ideClientSocket = new Socket(Proxy.NO_PROXY); /* handle environment in Proxy network */ + InetSocketAddress socketAddress = new InetSocketAddress(InetAddress.getLocalHost(), serverPort); + ideClientSocket.connect(socketAddress); } catch (UnknownHostException e) { DALog.printLog(e); ideClientSocket = null; diff --git a/package/changelog b/package/changelog index 043a756..b7a845b 100644 --- a/package/changelog +++ b/package/changelog @@ -1,3 +1,6 @@ +* 2.2.12 +- Fix communication with DA tool proxy network environment +== jungwook.ryu <jungwook.ryu@samsung.com> 2014-09-07 * 2.2.11 - Applied nativecommon-eplugin's change == gune.kim <gune.kim@samsung.com> 2014-09-03 diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest index 70c8f29..708050b 100644 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@ -1,4 +1,4 @@ -Version:2.2.11 +Version:2.2.12 Source:dynamic-analysis-ide-eplugin Maintainer:Jungwook Ryu <jungwook.ryu@samsung.com>, Juyoung Kim <j0.kim@samsung.com> |