From b5ab1f8eac5e38653b9e29992f71f161a47b4c89 Mon Sep 17 00:00:00 2001 From: Ben Steffensmeier Date: Mon, 15 Dec 2014 12:57:55 -0600 Subject: [PATCH] Issue #3923 Fix thin client grid updates. Former-commit-id: fa11934170d0e56cfb9694ad77d0b7c111ede361 [formerly 147b6c373356fba82bc00a94f0886795c83e90f2] [formerly 67701a2480c33f7af82d1e63b0fdb3387e799b9d] [formerly fa11934170d0e56cfb9694ad77d0b7c111ede361 [formerly 147b6c373356fba82bc00a94f0886795c83e90f2] [formerly 67701a2480c33f7af82d1e63b0fdb3387e799b9d] [formerly dcea13e602c7d51f75493fca28480146993802ad [formerly 67701a2480c33f7af82d1e63b0fdb3387e799b9d [formerly 537534fb920a8ea109d9bc655f16579cdb357dda]]]] Former-commit-id: dcea13e602c7d51f75493fca28480146993802ad Former-commit-id: e9f61f6b136893ae60a932b9216d88c0d8d631e6 [formerly 918bdad0f4c5c7800b40925540df3058c916148e] [formerly 25cbde3b79d123c25e9ccf8664cc1d78cd7d29da [formerly b9dfe6a44eed10d15b4df5fcac429fcf4deaa415]] Former-commit-id: b89e7c6a47927a440344448e662a9a69f501c069 [formerly 97a7386f66e0bf6fba39afb6b6df5609612d1657] Former-commit-id: deff57c9f83779875edcf656e17e8252d46ee937 --- .../cave/refresh/ThinClientDataUpdateTree.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java b/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java index 302610d774..f4763e6a2e 100644 --- a/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java +++ b/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java @@ -28,12 +28,12 @@ import java.util.Map; import java.util.Set; import java.util.TimeZone; -import com.raytheon.uf.common.inventory.exception.DataCubeException; import com.raytheon.uf.common.dataplugin.PluginDataObject; import com.raytheon.uf.common.dataquery.requests.DbQueryRequest; import com.raytheon.uf.common.dataquery.requests.RequestConstraint; import com.raytheon.uf.common.dataquery.requests.RequestConstraint.ConstraintType; import com.raytheon.uf.common.dataquery.responses.DbQueryResponse; +import com.raytheon.uf.common.inventory.exception.DataCubeException; import com.raytheon.uf.common.status.IUFStatusHandler; import com.raytheon.uf.common.status.UFStatus; import com.raytheon.uf.common.status.UFStatus.Priority; @@ -62,6 +62,7 @@ import com.raytheon.viz.grid.util.RadarAdapter; * Dec 13, 2011 bsteffen Initial creation * Feb 21, 2014 DR 16744 D. Friedman Add radar/grid updates * Apr 1, 2014 DR 17220 D. Friedman Handle uninitialized grid inventory + * Dec 15, 2014 3923 bsteffen Retrieve pdo for grid instead of dataURI. * * * @@ -179,14 +180,14 @@ public class ThinClientDataUpdateTree extends DataUpdateTree { newQuery.put("insertTime", new RequestConstraint(time, ConstraintType.GREATER_THAN)); dbRequest.setConstraints(newQuery); - dbRequest.addRequestField("dataURI"); DbQueryResponse response = null; try { response = (DbQueryResponse) ThriftClient.sendRequest(dbRequest); - for (String dataURI : response.getFieldObjects("dataURI", - String.class)) { + + for (PluginDataObject pdo : response + .getEntityObjects(PluginDataObject.class)) { AlertMessage am = new AlertMessage(); - am.dataURI = dataURI; + am.dataURI = pdo.getDataURI(); am.decodedAlert = RecordFactory.getInstance().loadMapFromUri( am.dataURI); messages.add(am);