Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 341366
Collapse All | Expand All

(-)miners/org/eclipse/rse/internal/dstore/universal/miners/command/OutputHandler.java (-7 / +10 lines)
Lines 1-5 Link Here
1
/*******************************************************************************
1
/*******************************************************************************
2
 * Copyright (c) 2006, 2010 IBM Corporation and others.
2
 * Copyright (c) 2006, 2011 IBM Corporation and others.
3
 * All rights reserved. This program and the accompanying materials
3
 * All rights reserved. This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
5
 * which accompanies this distribution, and is available at
Lines 22-27 Link Here
22
 * David McKnight   (IBM)     [302996] [dstore] null checks and performance issue with shell output
22
 * David McKnight   (IBM)     [302996] [dstore] null checks and performance issue with shell output
23
 * David McKnight   (IBM)     [309338] [dstore] z/OS USS - invocation of 'env' shell command returns inconsistently organized output
23
 * David McKnight   (IBM)     [309338] [dstore] z/OS USS - invocation of 'env' shell command returns inconsistently organized output
24
 * David McKnight   (IBM)     [312415] [dstore] shell service interprets < and > sequences - handle old client/new server case
24
 * David McKnight   (IBM)     [312415] [dstore] shell service interprets < and > sequences - handle old client/new server case
25
 * David McKnight   (IBM)     [341366] [dstore][shells] codepage IBM-1141 has faulty display of \ character
25
 *******************************************************************************/
26
 *******************************************************************************/
26
27
27
package org.eclipse.rse.internal.dstore.universal.miners.command;
28
package org.eclipse.rse.internal.dstore.universal.miners.command;
Lines 33-38 Link Here
33
import java.util.StringTokenizer;
34
import java.util.StringTokenizer;
34
35
35
import org.eclipse.dstore.core.model.Handler;
36
import org.eclipse.dstore.core.model.Handler;
37
import org.eclipse.dstore.internal.core.model.IDataStoreSystemProperties;
36
38
37
/**
39
/**
38
 * The OutputHandler class is used to listen to a particular output or error stream, 
40
 * The OutputHandler class is used to listen to a particular output or error stream, 
Lines 74-80 Link Here
74
76
75
		_encodings = new ArrayList();
77
		_encodings = new ArrayList();
76
		String system = System.getProperty("os.name").toLowerCase(); //$NON-NLS-1$
78
		String system = System.getProperty("os.name").toLowerCase(); //$NON-NLS-1$
77
79
		
80
		// use special encoding first if it exists
81
		String specialEncoding = System.getProperty(IDataStoreSystemProperties.DSTORE_STDIN_ENCODING);
82
		if (specialEncoding != null) {
83
			_encodings.add(specialEncoding);
84
		}
85
		
78
		if (system.startsWith("z")) { //$NON-NLS-1$
86
		if (system.startsWith("z")) { //$NON-NLS-1$
79
			_encodings.add("IBM-1047"); //$NON-NLS-1$
87
			_encodings.add("IBM-1047"); //$NON-NLS-1$
80
			/*
88
			/*
Lines 82-92 Link Here
82
			 * _encodings.add("UTF8");
90
			 * _encodings.add("UTF8");
83
			 */
91
			 */
84
		} else {
92
		} else {
85
			String specialEncoding = System
86
					.getProperty("dstore.stdin.encoding"); //$NON-NLS-1$
87
			if (specialEncoding != null) {
88
				_encodings.add(specialEncoding);
89
			}
90
			_encodings.add(System.getProperty("file.encoding")); //$NON-NLS-1$
93
			_encodings.add(System.getProperty("file.encoding")); //$NON-NLS-1$
91
		}
94
		}
92
95

Return to bug 341366