From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 1 Mar 2022 12:06:05 +0000 (+0100)
Subject: Tolerate null return from execution
X-Git-Tag: v8.0.0~19
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=yangtools.git;a=commitdiff_plain;h=f6fd714443d005f094fef32922010908d0f70b08

Tolerate null return from execution

We have inconsistent handling of null, fix that up.

Change-Id: I3357162f85fb41dc2ea94bd1819f6731d53b8c77
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---

diff --git a/plugin/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessor.java b/plugin/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessor.java
index c75590a796..e618356b85 100644
--- a/plugin/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessor.java
+++ b/plugin/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessor.java
@@ -338,9 +338,16 @@ class YangToSourcesProcessor {
             }
 
             LOG.debug("{} Sources generated by {}: {}", LOG_PREFIX, factory.generatorName(), files);
-            LOG.info("{} Sources generated by {}: {} in {}", LOG_PREFIX, factory.generatorName(),
-                files == null ? 0 : files.size(), sw);
-            allFiles.addAll(files);
+
+            final int fileCount;
+            if (files != null) {
+                fileCount = files.size();
+                allFiles.addAll(files);
+            } else {
+                fileCount = 0;
+            }
+
+            LOG.info("{} Sources generated by {}: {} in {}", LOG_PREFIX, factory.generatorName(), fileCount, sw);
         }
 
         return allFiles.build();