From d64ea294f716fbbe09f8dea32b7512f48484d539 Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Sun, 22 Mar 2026 19:54:01 +0000
Subject: [PATCH] 8378919: Remove AppContext from the java.awt.Desktop class

Reviewed-by: serb, dnguyen
---
 src/java.desktop/share/classes/java/awt/Desktop.java | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/java.desktop/share/classes/java/awt/Desktop.java b/src/java.desktop/share/classes/java/awt/Desktop.java
index 3f73fa6cd81..43bd1f9c11c 100644
--- a/src/java.desktop/share/classes/java/awt/Desktop.java
+++ b/src/java.desktop/share/classes/java/awt/Desktop.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -272,6 +272,8 @@ public class Desktop {
         }
     }
 
+    private static Desktop desktop;
+
     /**
      * Returns the {@code Desktop} instance of the current
      * desktop context. On some platforms the Desktop API may not be
@@ -292,12 +294,8 @@ public class Desktop {
                                                     "supported on the current platform");
         }
 
-        sun.awt.AppContext context = sun.awt.AppContext.getAppContext();
-        Desktop desktop = (Desktop)context.get(Desktop.class);
-
         if (desktop == null) {
             desktop = new Desktop();
-            context.put(Desktop.class, desktop);
         }
 
         return desktop;