From ce341edf4c0cb32be77b4c2946ac1b831236a2d4 Mon Sep 17 00:00:00 2001
From: Nate Jensen <Nathan.Jensen@raytheon.com>
Date: Mon, 11 Feb 2013 15:40:39 -0600
Subject: [PATCH] Issue #1601 fix error

Change-Id: Ia9749ff77222ea5f136fff7b5bf575b42c29906b

Former-commit-id: 762d2d54e1f58c87be456b0370cd29bafa076cca [formerly a34a9941c7ee46bf5dd648f6e6188dfb847be6dd] [formerly 762d2d54e1f58c87be456b0370cd29bafa076cca [formerly a34a9941c7ee46bf5dd648f6e6188dfb847be6dd] [formerly e6b7bd90341be591d0a1b9f76f491d83e95b11f8 [formerly a893b0ea01e31e1c5c8b5048f536b59cc36ca810]]]
Former-commit-id: e6b7bd90341be591d0a1b9f76f491d83e95b11f8
Former-commit-id: 0abf696eeebe2196a7d0c6df7ff4a19ae0557e8b [formerly 5315c1d40acc88ec565c94478c6523ee64993695]
Former-commit-id: d3deaff6929e4a6803c6bb922b319cb7a48c6eda
---
 .../viz/derivparam/library/DerivedParameterGenerator.java  | 7 ++++---
 .../rsc/retrieve/AbstractDbPlotInfoRetriever.java          | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java b/cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
index 8ce09713e4..0695094eca 100644
--- a/cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
+++ b/cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
@@ -26,7 +26,8 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
 
 import javax.measure.unit.Unit;
 import javax.xml.bind.JAXBException;
@@ -155,7 +156,7 @@ public class DerivedParameterGenerator implements ILocalizationFileObserver {
 
     private Map<String, DerivParamDesc> derParLibrary;
 
-    private ArrayBlockingQueue<DerivedParameterRequest> toDoList;
+    private BlockingQueue<DerivedParameterRequest> toDoList;
 
     private static int numJobs = 2;
 
@@ -233,7 +234,7 @@ public class DerivedParameterGenerator implements ILocalizationFileObserver {
             }
         }
 
-        toDoList = new ArrayBlockingQueue<DerivedParameterRequest>(50);
+        toDoList = new LinkedBlockingQueue<DerivedParameterRequest>();
         LocalizationFile dir = PathManagerFactory.getPathManager()
                 .getStaticLocalizationFile(DERIV_PARAM_DIR);
         if (dir != null) {
diff --git a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/retrieve/AbstractDbPlotInfoRetriever.java b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/retrieve/AbstractDbPlotInfoRetriever.java
index 80368b6289..f493a584af 100644
--- a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/retrieve/AbstractDbPlotInfoRetriever.java
+++ b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/retrieve/AbstractDbPlotInfoRetriever.java
@@ -81,7 +81,8 @@ public abstract class AbstractDbPlotInfoRetriever extends
             HashMap<String, RequestConstraint> metadataMap) throws VizException {
         DbQuery dq = getQueryObject(metadataMap);
         List<PlotInfo> info = runStationQuery(dq);
-        listener.resourceChanged(ChangeType.DATA_UPDATE, info.toArray());
+        listener.resourceChanged(ChangeType.DATA_UPDATE,
+                info.toArray(new PlotInfo[0]));
     }
 
     protected List<PlotInfo> runStationQuery(DbQuery dq) throws VizException {