Attachment 192196 Details for Bug 341366 – patch to use special encoding if set when on zos

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

[patch] patch to use special encoding if set when on zos

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

on 2011-03-30 10:30:08 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: David McKnight

Created: 2011-03-30 10:30:08 EDT

Size: 2.80 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rse.services.dstore
>Index: miners/org/eclipse/rse/internal/dstore/universal/miners/command/OutputHandler.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/command/OutputHandler.java,v
>retrieving revision 1.20
>diff -u -r1.20 OutputHandler.java
>--- miners/org/eclipse/rse/internal/dstore/universal/miners/command/OutputHandler.java	11 May 2010 13:33:45 -0000	1.20
>+++ miners/org/eclipse/rse/internal/dstore/universal/miners/command/OutputHandler.java	30 Mar 2011 14:30:20 -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
>@@ -22,6 +22,7 @@
>  * David McKnight   (IBM)     [302996] [dstore] null checks and performance issue with shell output
>  * David McKnight   (IBM)     [309338] [dstore] z/OS USS - invocation of 'env' shell command returns inconsistently organized output
>  * David McKnight   (IBM)     [312415] [dstore] shell service interprets &lt; and &gt; sequences - handle old client/new server case
>+ * David McKnight   (IBM)     [341366] [dstore][shells] codepage IBM-1141 has faulty display of \ character
>  *******************************************************************************/
> 
> package org.eclipse.rse.internal.dstore.universal.miners.command;
>@@ -33,6 +34,7 @@
> import java.util.StringTokenizer;
> 
> import org.eclipse.dstore.core.model.Handler;
>+import org.eclipse.dstore.internal.core.model.IDataStoreSystemProperties;
> 
> /**
>  * The OutputHandler class is used to listen to a particular output or error stream, 
>@@ -74,7 +76,13 @@
> 
> 		_encodings = new ArrayList();
> 		String system = System.getProperty("os.name").toLowerCase(); //$NON-NLS-1$
>-
>+		
>+		// use special encoding first if it exists
>+		String specialEncoding = System.getProperty(IDataStoreSystemProperties.DSTORE_STDIN_ENCODING);
>+		if (specialEncoding != null) {
>+			_encodings.add(specialEncoding);
>+		}
>+		
> 		if (system.startsWith("z")) { //$NON-NLS-1$
> 			_encodings.add("IBM-1047"); //$NON-NLS-1$
> 			/*
>@@ -82,11 +90,6 @@
> 			 * _encodings.add("UTF8");
> 			 */
> 		} else {
>-			String specialEncoding = System
>-					.getProperty("dstore.stdin.encoding"); //$NON-NLS-1$
>-			if (specialEncoding != null) {
>-				_encodings.add(specialEncoding);
>-			}
> 			_encodings.add(System.getProperty("file.encoding")); //$NON-NLS-1$
> 		}
>

Actions: View | Diff

Attachments on bug 341366: 192196