From 04edcf722cd71a6c807c57449fb81ec337097e1a Mon Sep 17 00:00:00 2001
From: Anton Tarasov <ant@openjdk.org>
Date: Fri, 14 Nov 2014 12:32:43 +0300
Subject: [PATCH] 8004148: NPE in sun.awt.SunToolkit.getWindowDeactivationTime

Reviewed-by: serb
---
 jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java b/jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java
index 29f8c297717..6d179aa4f9f 100644
--- a/jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java
+++ b/jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java
@@ -1882,6 +1882,9 @@ public abstract class SunToolkit extends Toolkit
 
     public synchronized void setWindowDeactivationTime(Window w, long time) {
         AppContext ctx = getAppContext(w);
+        if (ctx == null) {
+            return;
+        }
         @SuppressWarnings("unchecked")
         WeakHashMap<Window, Long> map = (WeakHashMap<Window, Long>)ctx.get(DEACTIVATION_TIMES_MAP_KEY);
         if (map == null) {
@@ -1893,6 +1896,9 @@ public abstract class SunToolkit extends Toolkit
 
     public synchronized long getWindowDeactivationTime(Window w) {
         AppContext ctx = getAppContext(w);
+        if (ctx == null) {
+            return -1;
+        }
         @SuppressWarnings("unchecked")
         WeakHashMap<Window, Long> map = (WeakHashMap<Window, Long>)ctx.get(DEACTIVATION_TIMES_MAP_KEY);
         if (map == null) {