mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-04 23:05:47 +02:00
Code Issues Wiki Activity

[343939][dstore][windows] DBCS3.7 DBCS characters are corrupted in Files

Browse source
This commit is contained in:
David McKnight 2011-05-11 13:36:58 +00:00
parent de10e555a2
commit f85de17305
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/Sender.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2002, 2010 IBM Corporation and others. * Copyright (c) 2002, 2011 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -15,6 +15,7 @@
* David McKnight (IBM) [222168][dstore] Buffer in DataElement is not sent * David McKnight (IBM) [222168][dstore] Buffer in DataElement is not sent
* David McKnight (IBM) [305218][dstore] problem reading double-byte characters through data socket layer * David McKnight (IBM) [305218][dstore] problem reading double-byte characters through data socket layer
* David McKnight (IBM) [307541][dstore] fix for Bug 305218 breaks RDz connections * David McKnight (IBM) [307541][dstore] fix for Bug 305218 breaks RDz connections
* David McKnight (IBM) [343939][dstore][windows] DBCS3.7 DBCS characters are corrupted in Files
*******************************************************************************/ *******************************************************************************/
package org.eclipse.dstore.internal.core.util; package org.eclipse.dstore.internal.core.util;
@ -75,13 +76,12 @@ public class Sender implements ISender
String encoding = DE.ENCODING_UTF_8; String encoding = DE.ENCODING_UTF_8;
if (!_dataStore.isVirtual()){ if (!_dataStore.isVirtual()){
encoding = System.getProperty("file.encoding"); //$NON-NLS-1$ encoding = System.getProperty("file.encoding"); //$NON-NLS-1$
String theOS = System.getProperty("os.name"); //$NON-NLS-1$ String theOS = System.getProperty("os.name").toLowerCase(); //$NON-NLS-1$
if (theOS.startsWith("z")){ //$NON-NLS-1$ if (theOS.startsWith("z") || theOS.startsWith("win")){ //$NON-NLS-1$ //$NON-NLS-2$
encoding = DE.ENCODING_UTF_8; encoding = DE.ENCODING_UTF_8;
} }
} }
OutputStreamWriter writer = new OutputStreamWriter(_socket.getOutputStream(), encoding); OutputStreamWriter writer = new OutputStreamWriter(_socket.getOutputStream(), encoding);
_outData = new BufferedWriter(writer); _outData = new BufferedWriter(writer);

5
rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/XMLparser.java
View file

@ -22,6 +22,7 @@
* David McKnight (IBM) [322407][dstore] Connection dropped automatically when idle * David McKnight (IBM) [322407][dstore] Connection dropped automatically when idle
* Noriaki Takatsu (IBM) - [289234][multithread][api] Reset and Restart KeepAliveRequestThread * Noriaki Takatsu (IBM) - [289234][multithread][api] Reset and Restart KeepAliveRequestThread
* David McKnight (IBM) - [282364] [dstore][multithread] timer-threads stay active after disconnect * David McKnight (IBM) - [282364] [dstore][multithread] timer-threads stay active after disconnect
* David McKnight (IBM) [343939][dstore][windows] DBCS3.7 DBCS characters are corrupted in Files
*******************************************************************************/ *******************************************************************************/
package org.eclipse.dstore.internal.core.util; package org.eclipse.dstore.internal.core.util;
@ -483,8 +484,8 @@ public class XMLparser
String encoding = DE.ENCODING_UTF_8; String encoding = DE.ENCODING_UTF_8;
if (!_dataStore.isVirtual()){ if (!_dataStore.isVirtual()){
encoding = System.getProperty("file.encoding"); //$NON-NLS-1$ encoding = System.getProperty("file.encoding"); //$NON-NLS-1$
String theOS = System.getProperty("os.name"); //$NON-NLS-1$ String theOS = System.getProperty("os.name").toLowerCase(); //$NON-NLS-1$
if (theOS.startsWith("z")){ //$NON-NLS-1$ if (theOS.startsWith("z") || theOS.startsWith("win")){ //$NON-NLS-1$ //$NON-NLS-2$
encoding = DE.ENCODING_UTF_8; encoding = DE.ENCODING_UTF_8;
} }
} }