Merge "Issue #1601 fix error" into development

Former-commit-id: 992c303bf0 [formerly 9b1472b368] [formerly 992c303bf0 [formerly 9b1472b368] [formerly 8abc835e59 [formerly 22c111e1b4df1236c086c20dac1d4975ed81ffeb]]]
Former-commit-id: 8abc835e59
Former-commit-id: b9a7fcedaa [formerly 7b4c1a05fe]
Former-commit-id: cd98a99fe7
This commit is contained in:
Nate Jensen 2013-02-11 16:04:13 -06:00 committed by Gerrit Code Review
commit 289a78f6d9
2 changed files with 6 additions and 4 deletions

View file

@ -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) {

View file

@ -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 {