# HG changeset patch
# User psadhukhan
# Date 1446548401 -10800
# Node ID f75ee0470f4b20f35bb9e05aca489d0e626cb8db
# Parent  3eb537b6bec04b65df341a84b766fd6f1362a049
8139216: Non-ASCII characters in CUPS printer names are not properly displayed
Reviewed-by: prr, rchamyal

diff -r 3eb537b6bec0 -r f75ee0470f4b jdk/src/java.desktop/unix/classes/sun/print/IPPPrintService.java
--- a/jdk/src/java.desktop/unix/classes/sun/print/IPPPrintService.java	Mon Nov 02 17:52:40 2015 +0400
+++ b/jdk/src/java.desktop/unix/classes/sun/print/IPPPrintService.java	Tue Nov 03 14:00:01 2015 +0300
@@ -321,7 +321,11 @@
         if ((name == null) || (url == null)){
             throw new IllegalArgumentException("null uri or printer name");
         }
-        printer = name;
+        try {
+            printer = java.net.URLDecoder.decode(name, "UTF-8");
+        } catch (java.io.UnsupportedEncodingException e) {
+            printer = name;
+        }
         supportedDocFlavors = null;
         supportedCats = null;
         mediaSizeNames = null;
@@ -351,7 +355,11 @@
         if ((name == null) || (uriStr == null)){
             throw new IllegalArgumentException("null uri or printer name");
         }
-        printer = name;
+        try {
+            printer = java.net.URLDecoder.decode(name, "UTF-8");
+        } catch (java.io.UnsupportedEncodingException e) {
+            printer = name;
+        }
         supportedDocFlavors = null;
         supportedCats = null;
         mediaSizeNames = null;