From 93003573f191b7bcf3cb97ad410f06b31e3d79dd Mon Sep 17 00:00:00 2001 From: Ben Steffensmeier Date: Fri, 19 Oct 2012 11:53:22 -0500 Subject: [PATCH] Issue #189 throw a more useful, less fatal error when grib data is loaded into a grid resource. Former-commit-id: fa272f522735ac0718f6a0c041101508ae839b86 [formerly 13932f9c1f1574c6a489c0c1a39ccc516363851a] [formerly 2fcaf9ff60ae52c88abc18226917390b42dc16e7] [formerly 96ca3108a483d7339a6bc1e20fc0b76ef49394e8 [formerly 2fcaf9ff60ae52c88abc18226917390b42dc16e7 [formerly 74e1f6e724627f452c808173be2968053f7dd6f9]]] Former-commit-id: 96ca3108a483d7339a6bc1e20fc0b76ef49394e8 Former-commit-id: de16a278b058b482d7252ac11e5ab9bcc74e01e8 [formerly d217ea2e213d1d47e7cb286e0ce6dde09e20766a] Former-commit-id: b234c6fcbf9650d8ee9e88b41b62ac1f84fea7af --- .../src/com/raytheon/viz/grid/rsc/GridResourceData.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridResourceData.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridResourceData.java index 4f8d607bef..62151fb594 100644 --- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridResourceData.java +++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridResourceData.java @@ -134,7 +134,13 @@ public class GridResourceData extends AbstractRequestableResourceData implements throws VizException { records = new GridRecord[objects.length]; for (int i = 0; i < objects.length; i++) { - records[i] = (GridRecord) objects[i]; + if (objects[i] instanceof GridRecord) { + records[i] = (GridRecord) objects[i]; + } else { + throw new IllegalArgumentException( + "GridResourceData only supports data stored in grid format, not " + + objects[i].getPluginName() + " data"); + } } sampling = sampling == null ? false : sampling; return new D2DGridResource(this, loadProperties);