diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/ExecuteIfpNetCDFGridRequestHandler.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/ExecuteIfpNetCDFGridRequestHandler.java index 31b92ed98a..b1f61feda3 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/ExecuteIfpNetCDFGridRequestHandler.java +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/ExecuteIfpNetCDFGridRequestHandler.java @@ -24,6 +24,8 @@ import java.util.Map; import com.raytheon.edex.plugin.gfe.isc.IscScript; import com.raytheon.edex.plugin.gfe.isc.IscScriptExecutor; +import com.raytheon.edex.plugin.gfe.server.IFPServer; +import com.raytheon.uf.common.dataplugin.gfe.db.objects.DatabaseID; import com.raytheon.uf.common.dataplugin.gfe.request.ExecuteIfpNetCDFGridRequest; import com.raytheon.uf.common.dataplugin.gfe.server.message.ServerResponse; import com.raytheon.uf.common.python.concurrent.PythonJobCoordinator; @@ -43,6 +45,7 @@ import com.raytheon.uf.common.status.UFStatus; * ------------ ---------- ----------- -------------------------- * Sep 24, 2010 dgilling Initial creation * Mar 11, 2013 #1759 dgilling Re-write using new IscScript classes. + * Nov 20, 2014 #98 lshi ifpnetCDF no longer gives an error code in some cases * * * @@ -70,6 +73,19 @@ public class ExecuteIfpNetCDFGridRequestHandler implements throws Exception { ServerResponse sr = new ServerResponse(); sr.setPayload(Boolean.FALSE); + + //#98 verify requested database exists + IFPServer ifpServer = IFPServer.getActiveServer(request.getDatabaseID() + .getSiteId()); + ServerResponse> ssr = ifpServer.getGridParmMgr() + .getDbInventory(); + if (!ssr.isOkay()) { + sr.addMessages(ssr); + return sr; + } else if (!ssr.getPayload().contains(request.getDatabaseID())) { + sr.addMessage(request.getDatabaseID() + " does not exist"); + return sr; + } statusHandler.debug("Received ifpnetCDF request: " + request); Map args = new HashMap();