From 87c2a034d4dd5dea66649d18fc1b8ca48fe264e5 Mon Sep 17 00:00:00 2001 From: Greg Watson Date: Mon, 24 Mar 2014 09:24:06 -0400 Subject: [PATCH] Return osgi properties insead of system properties on local provider for os name and arch. Signed-off-by: Greg Watson --- .../internal/core/services/local/LocalConnection.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/services/local/LocalConnection.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/services/local/LocalConnection.java index eed090ca796..8138744c610 100644 --- a/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/services/local/LocalConnection.java +++ b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/services/local/LocalConnection.java @@ -31,6 +31,7 @@ import org.eclipse.remote.core.IRemoteServices; import org.eclipse.remote.core.IUserAuthenticator; import org.eclipse.remote.core.exception.RemoteConnectionException; import org.eclipse.remote.core.exception.UnableToForwardPortException; +import org.eclipse.remote.internal.core.RemoteCorePlugin; import org.eclipse.remote.internal.core.messages.Messages; public class LocalConnection implements IRemoteConnection { @@ -263,6 +264,15 @@ public class LocalConnection implements IRemoteConnection { */ @Override public String getProperty(String key) { + /* + * Convert os.name and os.arch to framework properties so they make more sense + */ + switch (key) { + case IRemoteConnection.OS_NAME_PROPERTY: + return RemoteCorePlugin.getDefault().getBundle().getBundleContext().getProperty("osgi.os"); //$NON-NLS-1$ + case IRemoteConnection.OS_ARCH_PROPERTY: + return RemoteCorePlugin.getDefault().getBundle().getBundleContext().getProperty("osgi.arch"); //$NON-NLS-1$ + } return System.getProperty(key); }