mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-18 22:45:23 +02:00
Code Issues Wiki Activity

[350315][dstore] regress change made for bug 305218

Browse source
This commit is contained in:
David McKnight 2011-06-27 12:16:09 +00:00
parent 836d3eff87
commit 1962ef62c3
2 changed files with 4 additions and 18 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

@ -17,6 +17,7 @@
* 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 * David McKnight (IBM) [343939][dstore][windows] DBCS3.7 DBCS characters are corrupted in Files
* David McKnight (IBM) [347412][dstore] Need an option to set TCP NODELAYACKS * David McKnight (IBM) [347412][dstore] Need an option to set TCP NODELAYACKS
* David McKnight (IBM) [350315][dstore] regress change made for bug 305218
*******************************************************************************/ *******************************************************************************/
package org.eclipse.dstore.internal.core.util; package org.eclipse.dstore.internal.core.util;
@ -89,13 +90,6 @@ public class Sender implements ISender
_outFile = new PrintStream(_socket.getOutputStream()); _outFile = new PrintStream(_socket.getOutputStream());
String encoding = DE.ENCODING_UTF_8; String encoding = DE.ENCODING_UTF_8;
if (!_dataStore.isVirtual()){
encoding = System.getProperty("file.encoding"); //$NON-NLS-1$
String theOS = System.getProperty("os.name").toLowerCase(); //$NON-NLS-1$
if (theOS.startsWith("z") || theOS.startsWith("win")){ //$NON-NLS-1$ //$NON-NLS-2$
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);

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

@ -23,6 +23,7 @@
* 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 * David McKnight (IBM) [343939][dstore][windows] DBCS3.7 DBCS characters are corrupted in Files
* David McKnight (IBM) [350315][dstore] regress change made for bug 305218
*******************************************************************************/ *******************************************************************************/
package org.eclipse.dstore.internal.core.util; package org.eclipse.dstore.internal.core.util;
@ -480,16 +481,7 @@ public class XMLparser
if (offset > 0) if (offset > 0)
{ {
String result = null; String result = null;
String encoding = DE.ENCODING_UTF_8; String encoding = DE.ENCODING_UTF_8;
if (!_dataStore.isVirtual()){
encoding = System.getProperty("file.encoding"); //$NON-NLS-1$
String theOS = System.getProperty("os.name").toLowerCase(); //$NON-NLS-1$
if (theOS.startsWith("z") || theOS.startsWith("win")){ //$NON-NLS-1$ //$NON-NLS-2$
encoding = DE.ENCODING_UTF_8;
}
}
try try
{ {
result = new String(_byteBuffer, 0, offset, encoding); result = new String(_byteBuffer, 0, offset, encoding);