From 9b86fc6221b03a09a8bbee9dcaef58b6cc7f944a Mon Sep 17 00:00:00 2001
From: Ben Steffensmeier <Benjamin.P.Steffensmeier@raytheon.com>
Date: Tue, 4 Dec 2012 14:01:41 -0600
Subject: [PATCH] Issue #1387 updated style rules for RFC-FFG products, fixed
 never ending Requesting Gridded Data when RFC-FFG is loaded

Former-commit-id: 0aa85c1c28e6d3d8b89b57218a6e6848df041d45 [formerly 45220299f9e2625a0cb6fbdd3fe8172c7a02d784] [formerly 95dc87b6cf1db3d5e33e065e13eddf9987ca05df] [formerly e44db81177ddca3d27d43b7622525a4541996c00 [formerly 95dc87b6cf1db3d5e33e065e13eddf9987ca05df [formerly 26abcb77b1b1157ce6e8bc5bda28202430f2d4f7]]]
Former-commit-id: e44db81177ddca3d27d43b7622525a4541996c00
Former-commit-id: 621f07af3d6794831b815542020e9c529dd63003 [formerly e1b134aa35266ce62b5a2f6916e097c65d3671f2]
Former-commit-id: d3456e3ee38943a048f42e34a11043f40d819216
---
 .../localization/styleRules/gridImageryStyleRules.xml     | 8 +++-----
 .../raytheon/viz/grid/rsc/general/GridDataRequestJob.java | 7 +++++++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml b/cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
index 3a65243be8..1a43b114d0 100644
--- a/cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
+++ b/cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
@@ -4519,16 +4519,14 @@
 		</paramLevelMatches>
 		<imageStyle>
 			<displayUnits>in</displayUnits>
-			<range levelScale="LOG">
+			<range>
 				<minValue>0.0</minValue>
-<!-- 				<maxValue>16</maxValue>-->
+ 				<maxValue>16</maxValue>
 			</range>
 			<defaultColormap>Grid/gridded data</defaultColormap>
-			<!-- 
 			<colorbarLabeling>
-				<values>1 2 4 6 6.667 10 12 15</values>
+				<increment>2</increment>
 			</colorbarLabeling>
-			-->
 		</imageStyle>
 	</styleRule>
 	<styleRule>
diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GridDataRequestJob.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GridDataRequestJob.java
index 7040cfe165..1b38d28927 100644
--- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GridDataRequestJob.java
+++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GridDataRequestJob.java
@@ -91,6 +91,13 @@ class GridDataRequestJob extends Job {
         for (GridDataRequest request = getNext(); request != null; request = getNext()) {
             try {
                 request.gridData = resource.getData(request.time, request.pdos);
+                if (request.gridData == null) {
+                    // need to remove unfulfillable requests to avoid infinite
+                    // loop.
+                    synchronized (requests) {
+                        requests.remove(request);
+                    }
+                }
                 resource.issueRefresh();
             } catch (VizException e) {
                 synchronized (requests) {