Fix communication with DA tool proxy network environment

Change-Id: I9a7018bd3d4f75428c84078ab91dbc1507e51fc3
Signed-off-by: jungwook.ryu <jungwook.ryu@samsung.com>

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 (file)
--- 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 (file)
--- 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 (file)
--- 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>