Get output bins by ipp on Linux and cups on MacOS

AlexanderScherbatiy · May 20, 2024 · cf29b09 · cf29b09
1 parent 3922ed9
commit cf29b09
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/src/java.desktop/unix/classes/sun/print/IPPPrintService.java b/src/java.desktop/unix/classes/sun/print/IPPPrintService.java
@@ -473,13 +473,6 @@ private void initAttributes() {
             // get all supported attributes through IPP
             opGetAttributes();
 
-            // check IPP values first for OutputBins
-            outputBins = getSupportedOutputBins();
-
-            if (JAVA_PRINT_DEBUG) {
-                printOutputBins("IPP", outputBins);
-            }
-
             if (isCupsPrinter) {
                 // note, it is possible to query media in CUPS using IPP
                 // right now we always get it from PPD.
@@ -492,11 +485,11 @@ private void initAttributes() {
                         cps = new CUPSPrinter(printer);
                         mediaSizeNames = cps.getMediaSizeNames();
                         mediaTrays = cps.getMediaTrays();
-                        if (outputBins == null) {
-                            outputBins = cps.getOutputBins();
-                            if (JAVA_PRINT_DEBUG) {
-                                printOutputBins("CUPS", outputBins);
-                            }
+                        outputBins = PrintServiceLookupProvider.isMac()
+                                ? cps.getOutputBins()
+                                : getSupportedOutputBins();
+                        if (JAVA_PRINT_DEBUG) {
+                            printOutputBins("CUPS or IPP", outputBins);
                         }
                         customMediaSizeNames = cps.getCustomMediaSizeNames();
                         defaultMediaIndex = cps.getDefaultMediaIndex();
@@ -531,6 +524,15 @@ private void initAttributes() {
                 mediaTrays = new MediaTray[trayList.size()];
                 mediaTrays = trayList.toArray(mediaTrays);
             }
+
+            if (outputBins == null) {
+                outputBins = getSupportedOutputBins();
+            }
+
+            if (JAVA_PRINT_DEBUG) {
+                printOutputBins("IPP", outputBins);
+            }
+
             urlConnection.disconnect();
 
             init = true;