xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Issue #1998 fixed NPE in PointDataPluginDao" into development

Browse source 
Former-commit-id: 32909203d0 [formerly 21114964fa [formerly a04a5427256f18725d85da15497d9637419c885c]]
Former-commit-id: 21114964fa
Former-commit-id: 41a20fbd00
This commit is contained in:
Nate Jensen 2014-01-10 08:58:03 -06:00 • committed by Gerrit Code Review
commit 94c3370833
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
edexOsgi/com.raytheon.uf.common.datastorage/src/com/raytheon/uf/common/datastorage/StorageStatus.java
View file

@ -20,7 +20,6 @@
package com.raytheon.uf.common.datastorage;
import com.raytheon.uf.common.datastorage.IDataStore.StoreOp;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
@ -36,6 +35,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Dec 30, 2008 chammack Initial creation
* Jan 09, 2014 1998 bclement added hasExceptions method, removed ISerializableObject
*
* </pre>
*
@ -43,7 +43,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* @version 1.0
*/
@DynamicSerialize
public class StorageStatus implements ISerializableObject {
public class StorageStatus {
private StorageException[] exceptions;
@ -104,4 +104,11 @@ public class StorageStatus implements ISerializableObject {
this.indexOfAppend = indexOfAppend;
}
/**
* @return true if exceptions field is populated
*/
public boolean hasExceptions() {
return exceptions != null && exceptions.length > 0;
}
}

9
edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataPluginDao.java
View file

@ -75,6 +75,7 @@ import com.raytheon.uf.edex.database.plugin.PluginDao;
* Apr 29, 2013 1861 bkowal Refactor hdf5 filename generation during reads
* into its own method so modelsounding dao can
* override it.
* Jan 09, 2014 1998 bclement fixed NPE in persistToHDF5 when store failed
*
* </pre>
*
@ -196,7 +197,8 @@ public abstract class PointDataPluginDao<T extends PluginDataObject> extends
try {
StorageStatus ss = ds.store(StoreOp.APPEND);
if (ss.getOperationPerformed() == StoreOp.APPEND) {
if (!ss.hasExceptions()
&& ss.getOperationPerformed() == StoreOp.APPEND) {
// increment the indices
List<PointDataView> views = containerMap.get(container);
int idx = (int) ss.getIndexOfAppend()[0];
@ -211,9 +213,8 @@ public abstract class PointDataPluginDao<T extends PluginDataObject> extends
StorageStatus aggregatedStatus = new StorageStatus();
List<StorageException> se = new ArrayList<StorageException>();
for (StorageStatus ss : ssList) {
StorageException[] seArr = ss.getExceptions();
if (seArr != null) {
se.addAll(Arrays.asList(seArr));
if (ss.hasExceptions()) {
se.addAll(Arrays.asList(ss.getExceptions()));
}
}