changeset 12431:ca35fcebcc82

8085948: [Regression] Few Swing, AWT and 2D case fails with Decoder isn't implemented for WingDings Charset error on Windows Reviewed-by: prr, serb
author ssadetsky
date Tue, 21 Jul 2015 08:34:01 +0300
parents dfd10083103a
children 48f84bbb14bc
files src/java.desktop/share/classes/sun/awt/FontDescriptor.java
diffstat 1 files changed, 6 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.desktop/share/classes/sun/awt/FontDescriptor.java	Mon Jul 20 10:21:01 2015 +0400
+++ b/src/java.desktop/share/classes/sun/awt/FontDescriptor.java	Tue Jul 21 08:34:01 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,8 +24,8 @@
  */
 package sun.awt;
 
-import java.io.ByteArrayInputStream;
-import java.io.InputStreamReader;
+import java.io.ByteArrayOutputStream;
+import java.io.OutputStreamWriter;
 import java.io.IOException;;
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetEncoder;
@@ -54,10 +54,9 @@
         // The following looks odd but its the only public way to get the
         // historical name if one exists and the canonical name otherwise.
         try {
-            ByteArrayInputStream bais = new ByteArrayInputStream(new byte[8]);
-            InputStreamReader isr = new InputStreamReader(bais, cs);
-            this.charsetName = isr.getEncoding();
-            isr.close();
+            OutputStreamWriter osw = new OutputStreamWriter(new ByteArrayOutputStream(), cs);
+            this.charsetName = osw.getEncoding();
+            osw.close();
         } catch (IOException ioe) {
         }
     }