From 5373999a274d2458f9bab814949300ba3ecbde42 Mon Sep 17 00:00:00 2001 From: Steve Harris Date: Tue, 3 Sep 2013 09:58:18 -0400 Subject: [PATCH] 13.5.1-20 baseline Former-commit-id: a60b09705076f64b33193fc3baa5ba798f669bc0 [formerly a60b09705076f64b33193fc3baa5ba798f669bc0 [formerly 6ae21523e354f26dbf0a668239b75e9b679bbf1f]] Former-commit-id: 5f2a2434a6d05ca70129c386e307a7342ca0284e Former-commit-id: b99b6cf244d80a2fc4122c4d966d6aea3bbf0739 --- .../src/com/raytheon/uf/viz/d2d/ui/actions/ToggleTool.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/ToggleTool.java b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/ToggleTool.java index 5e794b1c4e..bab5c079f6 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/ToggleTool.java +++ b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/ToggleTool.java @@ -43,6 +43,7 @@ import com.raytheon.viz.ui.tools.AbstractTool; * ------------ ---------- ----------- -------------------------- * Feb 23, 2007 chammack Initial Creation. * Nov 3, 2009 3457 bsteffen Updated to change blend on all DisplayPanes, not just the active ones. + * Aug 30, 2013 DR 16555 D. Friedman Prevent NPE. * * * @@ -65,7 +66,7 @@ public class ToggleTool extends AbstractTool { ResourceList rscs = mapDescriptor.getResourceList(); for (ResourcePair rp : rscs) { AbstractVizResource rsc = rp.getResource(); - if (rsc.getCapabilities().hasCapability( + if (rsc != null && rsc.getCapabilities().hasCapability( BlendableCapability.class)) { rsc.getCapability(BlendableCapability.class).toggle(); }