From 0f73384cd45af4ef3619252e48a442162fc8b12d Mon Sep 17 00:00:00 2001 From: David McKnight Date: Thu, 22 Dec 2011 18:42:35 +0000 Subject: [PATCH] [367449] [dstore] allow custom encoding for data transport layer --- .../src/org/eclipse/dstore/internal/core/util/Sender.java | 5 +++++ .../src/org/eclipse/dstore/internal/core/util/XMLparser.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/Sender.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/Sender.java index 0b9ac9468ed..33b2ea65dad 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/Sender.java +++ b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/Sender.java @@ -19,6 +19,7 @@ * David McKnight (IBM) [347412][dstore] Need an option to set TCP NODELAYACKS * David McKnight (IBM) [350315][dstore] regress change made for bug 305218 * David McKnight (IBM) - [358301] [DSTORE] Hang during debug source look up + * David McKnight (IBM) - [367449] [dstore] allow custom encoding for data transport layer *******************************************************************************/ package org.eclipse.dstore.internal.core.util; @@ -93,6 +94,10 @@ public class Sender implements ISender _outFile = new PrintStream(_socket.getOutputStream()); String encoding = DE.ENCODING_UTF_8; + String serverEncoding = System.getProperty("DSTORE_SERVER_ENCODING"); //$NON-NLS-1$ + if (serverEncoding != null && serverEncoding.length() > 0){ + encoding = serverEncoding; + } OutputStreamWriter writer = new OutputStreamWriter(_socket.getOutputStream(), encoding); _outData = new BufferedWriter(writer); diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/XMLparser.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/XMLparser.java index f744dec9876..d6a3c5d6a59 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/XMLparser.java +++ b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/XMLparser.java @@ -25,6 +25,7 @@ * 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 * David McKnight (IBM) - [358301] [DSTORE] Hang during debug source look up + * David McKnight (IBM) - [367449] [dstore] allow custom encoding for data transport layer *******************************************************************************/ package org.eclipse.dstore.internal.core.util; @@ -483,6 +484,10 @@ public class XMLparser { String result = null; String encoding = DE.ENCODING_UTF_8; + String serverEncoding = System.getProperty("DSTORE_SERVER_ENCODING"); //$NON-NLS-1$ + if (serverEncoding != null && serverEncoding.length() > 0){ + encoding = serverEncoding; + } try { result = new String(_byteBuffer, 0, offset, encoding);