From 701d77dfd1192fd17cc2cb9242262eabbb16ebc5 Mon Sep 17 00:00:00 2001
From: Jennifer Godinez <jgodinez@openjdk.org>
Date: Wed, 10 Jul 2013 11:49:04 -0700
Subject: [PATCH] 8016737: After clicking on "Print UNCOLLATED" button, the
 print out come in order 'Page 1', 'Page 2', 'Page 1'

Reviewed-by: jchen, prr
---
 .../solaris/classes/sun/print/IPPPrintService.java    | 11 ++++++++++-
 .../classes/sun/print/UnixPrintServiceLookup.java     |  4 ++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/jdk/src/solaris/classes/sun/print/IPPPrintService.java b/jdk/src/solaris/classes/sun/print/IPPPrintService.java
index 1c441bd197e..dea62374103 100644
--- a/jdk/src/solaris/classes/sun/print/IPPPrintService.java
+++ b/jdk/src/solaris/classes/sun/print/IPPPrintService.java
@@ -1029,7 +1029,16 @@ public class IPPPrintService implements PrintService, SunPrinterJobService {
             // now supports collation and that most OS has a way
             // of setting it, it is a safe assumption to just always
             // include SheetCollate as supported attribute.
-            catList.add(SheetCollate.class);
+
+            /*
+               In Linux, we use Postscript for rendering but Linux still
+               has issues in propagating Postscript-embedded setpagedevice
+               setting like collation.  Therefore, we temporarily exclude
+               Linux.
+            */
+            if (!UnixPrintServiceLookup.isLinux()) {
+                catList.add(SheetCollate.class);
+            }
         }
 
         // With the assumption that  Chromaticity is equivalent to
diff --git a/jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java b/jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java
index c682634b7b6..2c2a6406293 100644
--- a/jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java
+++ b/jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java
@@ -123,6 +123,10 @@ public class UnixPrintServiceLookup extends PrintServiceLookup
         return osname.equals("SunOS");
     }
 
+    static boolean isLinux() {
+        return (osname.equals("Linux"));
+    }
+
     static boolean isBSD() {
         return (osname.equals("Linux") ||
                 osname.contains("OS X"));