From 592327f9bb32dc33ecd00bcce61ebb0af6d6472b Mon Sep 17 00:00:00 2001
From: Lee Venable <Lee_R_Venable@raytheon.com>
Date: Thu, 16 Jan 2014 10:35:12 -0600
Subject: [PATCH] Issue #2691 - Fixed null pointer exception when closing MPE
 perspective.

Former-commit-id: 7369e58fadd45e144e6463e6341cbe56f2d9537b [formerly 24a4cafd0c2dbf1cae4dce5014dd57ea0b126098] [formerly 8405e235e66f71e285a1ba92850c3f4d91be0fc0] [formerly 7369e58fadd45e144e6463e6341cbe56f2d9537b [formerly 24a4cafd0c2dbf1cae4dce5014dd57ea0b126098] [formerly 8405e235e66f71e285a1ba92850c3f4d91be0fc0] [formerly b435fd305052c4088b758307796ec2b6c9f7947a [formerly 8405e235e66f71e285a1ba92850c3f4d91be0fc0 [formerly fa5315a2874b91acaac4f5eb58142804a6a09ef8]]]]
Former-commit-id: b435fd305052c4088b758307796ec2b6c9f7947a
Former-commit-id: 1f51e0e218c8702858cafcfdf25929b3994c9aff [formerly a859b508810400dc7a92c87d99d0d219bb260d82] [formerly 3e9e28a9e6d59237117b55c63bbb1de8dbd573e0 [formerly bc07967e3b86f6bc6cff2f49405866126d7e7b7a]]
Former-commit-id: d6d4a5788dfb930e7322e7cf669bc8d320076e4f [formerly a49baddf987451be9c70d89bf551114786f2b7c4]
Former-commit-id: 39c7b5dffbb4e244b40b3a521a95f74b90ce2fb8
---
 .../ui/actions/MPEColorScaleMgrAction.java    | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/MPEColorScaleMgrAction.java b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/MPEColorScaleMgrAction.java
index eca70fdf22..7cd3e6761a 100644
--- a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/MPEColorScaleMgrAction.java
+++ b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/MPEColorScaleMgrAction.java
@@ -42,9 +42,12 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Dec 5, 2008            mschenke     Initial creation
- * Apr 18, 2013    1920   mpduff       Set new ColorMap.
- * Jul 02, 2013  2088      rferrel     Changes for non-blocking ColorScaleMgrDlg.
+ * Dec 5, 2008             mschenke    Initial creation
+ * Apr 18, 2013 #1920      mpduff      Set new ColorMap.
+ * Jul 02, 2013 #2088      rferrel     Changes for non-blocking ColorScaleMgrDlg.
+ * Jan 16, 2014 #2691      lvenable    Fixed null pointer exception that occurs when closing
+ *                                     the MPE perspective while the ColorScaleMgrDlg is
+ *                                     visible.
  * </pre>
  * 
  * @author mschenke
@@ -74,8 +77,16 @@ public class MPEColorScaleMgrAction extends AbstractHandler {
                 public void dialogClosed(Object returnValue) {
                     colorScaleDlg = null;
 
-                    MPEFieldResource displayedFieldResource = MPEDisplayManager
-                            .getCurrent().getDisplayedFieldResource();
+                    MPEDisplayManager mdm = MPEDisplayManager.getCurrent();
+
+                    // If the MPE Display Manager is null then return as no
+                    // action is needed.
+                    if (mdm == null) {
+                        return;
+                    }
+
+                    MPEFieldResource displayedFieldResource = mdm
+                            .getDisplayedFieldResource();
 
                     if (displayedFieldResource != null) {
                         MPEFieldResourceData resourceData = displayedFieldResource