FIX NPE when a series with no observations exist, the next values che…

…ck fails because the session is closed
52North · May 16, 2019 · 208bff0 · 208bff0
1 parent 653827e
commit 208bff0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -19,6 +19,7 @@
 ### Fixed issues
 
   - Cache update of result templates with dynamic feattureOfInterest definition
+  - NPE when a series with no observations exist, the next values check fails because the session is closed
 
 ## Release 52n-sensorweb-sos-4.4.6
 

diff --git a/...rnate/dao/src/main/java/org/n52/sos/ds/hibernate/values/HibernateChunkStreamingValue.java b/...rnate/dao/src/main/java/org/n52/sos/ds/hibernate/values/HibernateChunkStreamingValue.java
@@ -84,7 +84,7 @@ public HibernateChunkStreamingValue(GetObservationRequest request, long procedur
     @Override
     public boolean hasNextValue() throws OwsExceptionReport {
         boolean next = false;
-        if (valuesResult == null || !valuesResult.hasNext()) {
+        if ((valuesResult == null || !valuesResult.hasNext()) && getSession().isOpen()) {
             if (!noChunk) {
                 getNextResults();
                 if (chunkSize <= 0 || (valueCounter != 0 && valueCounter < chunkSize)) {

diff --git a/.../main/java/org/n52/sos/ds/hibernate/values/series/HibernateChunkSeriesStreamingValue.java b/.../main/java/org/n52/sos/ds/hibernate/values/series/HibernateChunkSeriesStreamingValue.java
@@ -83,7 +83,7 @@ public HibernateChunkSeriesStreamingValue(AbstractObservationRequest request, lo
     @Override
     public boolean hasNextValue() throws OwsExceptionReport {
         boolean next = false;
-        if (seriesValuesResult == null || !seriesValuesResult.hasNext()) {
+        if ((seriesValuesResult == null || !seriesValuesResult.hasNext()) && getSession().isOpen()) {
             if (!noChunk && (valueCounter == 0 || valueCounter == chunkSize)) {
                 getNextResults();
                 if (chunkSize <= 0 || (valueCounter != 0 && valueCounter < chunkSize)) {