[sis] branch geoapi-4.0 updated: Fix a NullPointerException (bug identified by Johann).

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git


The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
     new 7db89b6  Fix a NullPointerException (bug identified by Johann).
7db89b6 is described below

commit 7db89b6c55397b233f6620b869f4c05e915821db
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Tue Feb 4 23:51:57 2020 +0100

    Fix a NullPointerException (bug identified by Johann).
---
 .../java/org/apache/sis/internal/storage/ConcatenatedFeatureSet.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/ConcatenatedFeatureSet.java
 
b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/ConcatenatedFeatureSet.java
index 3e0b5a7..db05e2b 100644
--- 
a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/ConcatenatedFeatureSet.java
+++ 
b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/ConcatenatedFeatureSet.java
@@ -192,7 +192,7 @@ public class ConcatenatedFeatureSet extends 
AggregatedFeatureSet {
                     }
                 }
             }
-            return null;                 // A source can not provide 
estimation.
+            return OptionalLong.empty();                        // A source 
can not provide estimation.
         }
         return OptionalLong.of(sum);
     }