From c0556cd7e9e4f3abf67658fddf86676e05042c1e Mon Sep 17 00:00:00 2001
From: jgodinez <unknown>
Date: Tue, 26 Nov 2013 10:24:59 -0800
Subject: [PATCH] 8028584: sun.net.www.protocol.file.FileURLConnection cannot
 be cast to java.net.HttpURLConnection Reviewed-by: bae, prr

---
 src/solaris/classes/sun/print/IPPPrintService.java         | 7 +++++--
 src/solaris/classes/sun/print/UnixPrintServiceLookup.java  | 2 +-
 .../awt/print/PageFormat/PageFormatFromAttributes.java     | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/solaris/classes/sun/print/IPPPrintService.java b/src/solaris/classes/sun/print/IPPPrintService.java
index 329bb2934..f48dd5ba3 100644
--- a/src/solaris/classes/sun/print/IPPPrintService.java
+++ b/src/solaris/classes/sun/print/IPPPrintService.java
@@ -44,6 +44,7 @@ import javax.print.event.PrintServiceAttributeListener;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.net.URLConnection;
 import java.net.HttpURLConnection;
 import java.io.File;
 import java.io.InputStream;
@@ -1607,14 +1608,16 @@ public class IPPPrintService implements PrintService, SunPrinterJobService {
 
     public static HttpURLConnection getIPPConnection(URL url) {
         HttpURLConnection connection;
+        URLConnection urlc;
         try {
-            connection = (HttpURLConnection)url.openConnection();
+            urlc = url.openConnection();
         } catch (java.io.IOException ioe) {
             return null;
         }
-        if (!(connection instanceof HttpURLConnection)) {
+        if (!(urlc instanceof HttpURLConnection)) {
             return null;
         }
+        connection = (HttpURLConnection)urlc;
         connection.setUseCaches(false);
         connection.setDefaultUseCaches(false);
         connection.setDoInput(true);
diff --git a/src/solaris/classes/sun/print/UnixPrintServiceLookup.java b/src/solaris/classes/sun/print/UnixPrintServiceLookup.java
index 2c9acbcdf..fb6950b7d 100644
--- a/src/solaris/classes/sun/print/UnixPrintServiceLookup.java
+++ b/src/solaris/classes/sun/print/UnixPrintServiceLookup.java
@@ -620,7 +620,7 @@ public class UnixPrintServiceLookup extends PrintServiceLookup
             if (CUPSPrinter.isCupsRunning()) {
                 try {
                     PrintService defaultPS;
-                    if (psuri != null) {
+                    if ((psuri != null) && !psuri.startsWith("file")) {
                         defaultPS = new IPPPrintService(defaultPrinter,
                                                         psuri, true);
                     } else {
diff --git a/test/java/awt/print/PageFormat/PageFormatFromAttributes.java b/test/java/awt/print/PageFormat/PageFormatFromAttributes.java
index de154c039..8b291388f 100644
--- a/test/java/awt/print/PageFormat/PageFormatFromAttributes.java
+++ b/test/java/awt/print/PageFormat/PageFormatFromAttributes.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 4500750 6848799
+ * @bug 4500750 6848799 8028584
  * @summary Tests creating page format from attributes
  * @run main PageFormatFromAttributes
  */
-- 
GitLab