bug 257172: [Net] Get rid of System.getenv(String) invocation

1 files changed, 13 insertions, 4 deletions

diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/unix/UnixProxyProvider.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/unix/UnixProxyProvider.java
index 661cec9fe..af3838523 100644
--- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/unix/UnixProxyProvider.java
+++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/unix/UnixProxyProvider.java
@@ -11,9 +11,11 @@
  *******************************************************************************/
 package org.eclipse.core.internal.net.proxy.unix;
 
+import java.io.IOException;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.Locale;
+import java.util.Properties;
 
 import org.eclipse.core.internal.net.AbstractProxyProvider;
 import org.eclipse.core.internal.net.Activator;
@@ -178,13 +180,20 @@ public class UnixProxyProvider extends AbstractProxyProvider {
 	}
 
 	private String getEnv(String env) {
+		String cmd[] = { "/bin/sh", //$NON-NLS-1$
+				"-c", //$NON-NLS-1$
+				"env | grep -i proxy" }; //$NON-NLS-1$
+		Properties props = new Properties();
 		try {
-			return System.getenv(env);
-		} catch (SecurityException e) {
+			props.load(Runtime.getRuntime().exec(cmd).getInputStream());
+		} catch (IOException e) {
 			Activator.logError(
-					"Security exception occured wile getting env variable", e); //$NON-NLS-1$
-			return null;
+					"Problem during accessing system variable: " + env, e); //$NON-NLS-1$
+		} catch (IllegalArgumentException e) {
+			Activator.logError(
+					"Problem during accessing system variable: " + env, e); //$NON-NLS-1$
 		}
+		return props.getProperty(env);
 	}
 
 	private static void loadGnomeLib() {