JBR-6183 Wayland: clipboard-related exception in headless environment

andreaippo · Nov 8, 2024 · e302f47 · e302f47
1 parent 67c8c4d
commit e302f47
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/src/java.desktop/unix/classes/sun/awt/wl/WLToolkit.java b/src/java.desktop/unix/classes/sun/awt/wl/WLToolkit.java
@@ -172,17 +172,18 @@ public WLToolkit() {
             toolkitSystemThread.setDaemon(true);
             toolkitSystemThread.start();
 
-            // Wait here for all display sync events to have been received?
-        }
+            WLClipboard selectionClipboard = null;
+            try {
+                selectionClipboard = new WLClipboard("Selection", true);
+            } catch (UnsupportedOperationException ignored) {
+            }
 
-        WLClipboard selectionClipboard = null;
-        try {
-            selectionClipboard = new WLClipboard("Selection", true);
-        } catch (UnsupportedOperationException ignored) {
+            clipboard = new WLClipboard("System", false);
+            selection = selectionClipboard;
+        } else {
+            clipboard = null;
+            selection = null;
         }
-
-        clipboard = new WLClipboard("System", false);
-        selection = selectionClipboard;
     }
 
     public static boolean isToolkitThread() {