Attachment 269293 Details for Bug 518909 – Fix for setting null encoding

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

[patch] Fix for setting null encoding

fix_set_null_encoding.patch (text/plain), 1.05 KB, created by Andreas Loth

on 2017-07-08 09:32:28 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Loth

Created: 2017-07-08 09:32:28 EDT

Size: 1.05 KB

patch

obsolete

>diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/console/IOConsoleOutputStream.java b/org.eclipse.ui.console/src/org/eclipse/ui/console/IOConsoleOutputStream.java
>index 0cba219..6f9c559 100644
>--- a/org.eclipse.ui.console/src/org/eclipse/ui/console/IOConsoleOutputStream.java
>+++ b/org.eclipse.ui.console/src/org/eclipse/ui/console/IOConsoleOutputStream.java
>@@ -16,6 +16,7 @@
> import java.nio.charset.Charset;
> 
> import org.eclipse.swt.graphics.Color;
>+import org.eclipse.ui.WorkbenchEncoding;
> import org.eclipse.ui.internal.console.IOConsolePartitioner;
> import org.eclipse.ui.internal.console.StreamDecoder;
> 
>@@ -311,7 +312,13 @@
>      * @param encoding encoding identifier
>      */
>     public void setEncoding(String encoding) {
>-		Charset charset = Charset.forName(encoding);
>+		String charsetName;
>+		if (encoding == null) {
>+			charsetName = WorkbenchEncoding.getWorkbenchDefaultEncoding();
>+		} else {
>+			charsetName = encoding;
>+		}
>+		Charset charset = Charset.forName(charsetName);
> 		try {
> 			this.setCharset(charset);
> 		} catch (IOException ioe) {

Actions: View | Diff

Attachments on bug 518909: 269292 | 269293