Tolerate null return from execution 18/99918/1
authorRobert Varga <robert.varga@pantheon.tech>
Tue, 1 Mar 2022 12:06:05 +0000 (13:06 +0100)
committerRobert Varga <robert.varga@pantheon.tech>
Tue, 1 Mar 2022 12:06:33 +0000 (13:06 +0100)
We have inconsistent handling of null, fix that up.

Change-Id: I3357162f85fb41dc2ea94bd1819f6731d53b8c77
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
plugin/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessor.java

index c75590a796d9217ccc6862b697917db59275f4cd..e618356b85068e7e3ea3c77f17e34ecafdf6c279 100644 (file)
@@ -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();