From 4fc26e3e82ea8f039f69b9d3a7fdb6d5011dbbab Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Tue, 12 May 2026 18:07:47 +0000
Subject: [PATCH] 8384208: Remove AppContext from java.awt.Taskbar

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

diff --git a/src/java.desktop/share/classes/java/awt/Taskbar.java b/src/java.desktop/share/classes/java/awt/Taskbar.java
index 2a46aca7116..3c81adf5a84 100644
--- a/src/java.desktop/share/classes/java/awt/Taskbar.java
+++ b/src/java.desktop/share/classes/java/awt/Taskbar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 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
@@ -184,6 +184,8 @@ public class Taskbar {
         }
     }
 
+    private static volatile Taskbar taskbar;
+
     /**
      * Returns the {@code Taskbar} instance of the current
      * taskbar context.  On some platforms the Taskbar API may not be
@@ -205,12 +207,8 @@ public class Taskbar {
                                                     "supported on the current platform");
         }
 
-        sun.awt.AppContext context = sun.awt.AppContext.getAppContext();
-        Taskbar taskbar = (Taskbar)context.get(Taskbar.class);
-
         if (taskbar == null) {
             taskbar = new Taskbar();
-            context.put(Taskbar.class, taskbar);
         }
 
         return taskbar;