From f6fd714443d005f094fef32922010908d0f70b08 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 1 Mar 2022 13:06:05 +0100 Subject: [PATCH] Tolerate null return from execution We have inconsistent handling of null, fix that up. Change-Id: I3357162f85fb41dc2ea94bd1819f6731d53b8c77 Signed-off-by: Robert Varga --- .../yang2sources/plugin/YangToSourcesProcessor.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) 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(); -- 2.36.6