correctly handle null features in CityJSONWriter

3dcitydb · Nov 25, 2023 · 70f2e91 · 70f2e91
1 parent 220f118
commit 70f2e91
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/citydb-io-citygml/src/main/java/org/citydb/io/citygml/writer/CityJSONWriter.java b/citydb-io-citygml/src/main/java/org/citydb/io/citygml/writer/CityJSONWriter.java
@@ -106,8 +106,13 @@ public CompletableFuture<Boolean> write(Feature feature) throws WriteException {
             countLatch.increment();
             service.execute(() -> {
                 try {
-                    writer.writeCityObject(helpers.get().getTopLevelFeature(feature));
-                    result.complete(true);
+                    AbstractFeature converted = helpers.get().getTopLevelFeature(feature);
+                    if (converted != null) {
+                        writer.writeCityObject(converted);
+                        result.complete(true);
+                    } else {
+                        result.complete(false);
+                    }
                 } catch (Throwable e) {
                     shouldRun = false;
                     result.completeExceptionally(new WriteException("Failed to write feature.", e));