From 57f34d2482bcdc2c4636cc64b5072af3e03e930f Mon Sep 17 00:00:00 2001
From: Oleg Pekhovskiy <bagiras@openjdk.org>
Date: Wed, 27 Apr 2011 15:26:38 +0400
Subject: [PATCH] 7035209: 6u26 ea b01 - running an applet with old plugin
 crashes in awt.dll

Reviewed-by: art, amenkov
---
 jdk/src/windows/native/sun/java2d/d3d/D3DPipelineManager.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jdk/src/windows/native/sun/java2d/d3d/D3DPipelineManager.cpp b/jdk/src/windows/native/sun/java2d/d3d/D3DPipelineManager.cpp
index a7da3f3b38c..a563c78802b 100644
--- a/jdk/src/windows/native/sun/java2d/d3d/D3DPipelineManager.cpp
+++ b/jdk/src/windows/native/sun/java2d/d3d/D3DPipelineManager.cpp
@@ -187,6 +187,7 @@ void D3DPipelineManager::NotifyAdapterEventListeners(UINT adapter,
     }
 
     JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
+    RETURN_IF_NULL(env);
 
     pMgr = D3DPipelineManager::GetInstance();
     RETURN_IF_NULL(pMgr);