From e016c43aa098926fe484ff4fb262cb37544303fa Mon Sep 17 00:00:00 2001
From: Ben Steffensmeier <Benjamin.P.Steffensmeier@raytheon.com>
Date: Thu, 18 Oct 2012 15:49:31 -0500
Subject: [PATCH] Issue #189 fix for derived parameters when requested times
 are not available

Former-commit-id: 452e0d17ff66f849bb3d1092c55aaaa700ba1441 [formerly 1aac04a5c0afdd4a355a7642b4f98e943bf26ac0] [formerly 452e0d17ff66f849bb3d1092c55aaaa700ba1441 [formerly 1aac04a5c0afdd4a355a7642b4f98e943bf26ac0] [formerly 2baae0a89f587cf4a63a50e81a00e3b1a5f45780 [formerly 09d7b089602ac73368202252eaf90f763c0650f4]]]
Former-commit-id: 2baae0a89f587cf4a63a50e81a00e3b1a5f45780
Former-commit-id: e50f7f2f265c4457bcddfbef7e0e955960fed328 [formerly e5282e3d10fcff7a21807d9c5cf9cf496048589b]
Former-commit-id: 891ae5bfef860584aeebd50932d9f2a0eb34074d
---
 .../raytheon/uf/viz/derivparam/inv/MetadataContainer.java    | 5 +++++
 .../raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java    | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/inv/MetadataContainer.java b/cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/inv/MetadataContainer.java
index 2e9a58e858..24a2a12dbc 100644
--- a/cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/inv/MetadataContainer.java
+++ b/cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/inv/MetadataContainer.java
@@ -20,6 +20,7 @@
 package com.raytheon.uf.viz.derivparam.inv;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -115,6 +116,10 @@ public class MetadataContainer {
     private Set<AbstractRequestableData> getData(AbstractRequestableNode node,
             Set<TimeAndSpace> availability, boolean doRequests)
             throws VizException {
+        if (availability == null || availability.isEmpty()) {
+            return Collections.emptySet();
+        }
+
         if (dataCache.containsKey(node)) {
             return dataCache.get(node);
         }
diff --git a/cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java b/cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java
index bb2c60ff0d..312b8fe16e 100644
--- a/cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java
+++ b/cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java
@@ -308,6 +308,9 @@ public class DerivedLevelNode extends AbstractDerivedDataNode {
         Map<DerivParamField, Set<TimeAndSpace>> availCache = this.availCache;
         availability = matcher.match(availability, availCache.get(null))
                 .keySet();
+        if (availability.isEmpty()) {
+            return Collections.emptySet();
+        }
         Map<TimeAndSpace, DerivedParameterRequest> mapOfRequests = new HashMap<TimeAndSpace, DerivedParameterRequest>(
                 availability.size());
         List<DerivedRequestableData> initResponses = new ArrayList<DerivedRequestableData>(