Attachment 208029 Details for Bug 365816 – backport patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] backport patch

patch.txt (text/plain), 2.68 KB, created by David McKnight

on 2011-12-06 17:21:20 EST

(hide)

Description:

Filename:

MIME Type:

Creator: David McKnight

Created: 2011-12-06 17:21:20 EST

Size: 2.68 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rse.services.dstore
>Index: miners/org/eclipse/rse/dstore/universal/miners/CommandMiner.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/CommandMiner.java,v
>retrieving revision 1.14
>diff -u -r1.14 CommandMiner.java
>--- miners/org/eclipse/rse/dstore/universal/miners/CommandMiner.java	22 Jul 2010 13:26:24 -0000	1.14
>+++ miners/org/eclipse/rse/dstore/universal/miners/CommandMiner.java	6 Dec 2011 22:21:06 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006, 2010 IBM Corporation and others.
>+ * Copyright (c) 2006, 2011 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -21,6 +21,7 @@
>  * David McKnight (IBM) - [286671] Dstore shell service interprets &lt; and &gt; sequences - cmd descriptor to identify ability
>  * David McKnight   (IBM)     [312415] [dstore] shell service interprets &lt; and &gt; sequences - handle old client/new server case
>  * David McKnight   (IBM)     [320624] [dstore] shell &lt; and &gt; sequence conversion not being applied to thread
>+ * Noriaki Takatsu  (IBM)  - [365765] [dstore][multithread]client environment cause harm to singe-process server
>  *******************************************************************************/
> 
> package org.eclipse.rse.dstore.universal.miners;
>@@ -37,6 +38,7 @@
> import org.eclipse.dstore.core.model.DataElement;
> import org.eclipse.dstore.core.model.DataStoreAttributes;
> import org.eclipse.dstore.core.model.DataStoreResources;
>+import org.eclipse.dstore.core.server.SystemServiceManager;
> import org.eclipse.rse.internal.dstore.universal.miners.command.CommandMinerThread;
> import org.eclipse.rse.internal.dstore.universal.miners.command.QueryPathThread;
> import org.eclipse.rse.internal.dstore.universal.miners.command.patterns.Patterns;
>@@ -207,8 +209,10 @@
> 			DataElement encodingArg = getCommandArgument(theElement, 1);
> 			if (encodingArg.getType().equals("shell.encoding")) //$NON-NLS-1$
> 			{
>-				// fix for 191599
>-				 System.setProperty("dstore.stdin.encoding",encodingArg.getValue()); //$NON-NLS-1$
>+				if (SystemServiceManager.getInstance().getSystemService() == null) {
>+					// fix for 191599
>+					System.setProperty("dstore.stdin.encoding",encodingArg.getValue());  //$NON-NLS-1$
>+				}
> 			}
> 			launchCommand(subject, invocation, status);
> 		}

Actions: View | Diff

Attachments on bug 365816: 208029