Repository: logging-log4j2 Updated Branches: refs/heads/master 88be0f58f -> 17b5c8a04
Fix possible NPEs. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/17b5c8a0 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/17b5c8a0 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/17b5c8a0 Branch: refs/heads/master Commit: 17b5c8a041ee09db9fc1f553ef237f82c12f6c79 Parents: 88be0f5 Author: ggregory <[email protected]> Authored: Sat Jun 27 00:54:52 2015 -0700 Committer: ggregory <[email protected]> Committed: Sat Jun 27 00:54:52 2015 -0700 ---------------------------------------------------------------------- .../appender/FlumeEmbeddedAppenderTest.java | 32 +++++++++++--------- .../appender/FlumePersistentAppenderTest.java | 31 ++++++++++--------- .../flume/appender/FlumePersistentPerf.java | 31 ++++++++++--------- 3 files changed, 49 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/17b5c8a0/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java ---------------------------------------------------------------------- diff --git a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java index 14399b1..4117836 100644 --- a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java +++ b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java @@ -232,21 +232,23 @@ public class FlumeEmbeddedAppenderTest { } - private static boolean deleteFiles(final File file) { - boolean result = true; - if (file.isDirectory()) { - - final File[] files = file.listFiles(); - for (final File child : files) { - result &= deleteFiles(child); - } - - } else if (!file.exists()) { - return true; - } - - return result & file.delete(); - } + private static boolean deleteFiles(final File file) { + boolean result = true; + if (file.isDirectory()) { + + final File[] files = file.listFiles(); + if (files != null) { + for (final File child : files) { + result &= deleteFiles(child); + } + } + + } else if (!file.exists()) { + return true; + } + + return result & file.delete(); + } private static class EventCollector implements AvroSourceProtocol { private final LinkedBlockingQueue<AvroFlumeEvent> eventQueue = new LinkedBlockingQueue<>(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/17b5c8a0/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java ---------------------------------------------------------------------- diff --git a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java index c91c53f..1dc7890 100644 --- a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java +++ b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java @@ -371,21 +371,22 @@ public class FlumePersistentAppenderTest { } - private static boolean deleteFiles(final File file) { - boolean result = true; - if (file.isDirectory()) { - - final File[] files = file.listFiles(); - for (final File child : files) { - result &= deleteFiles(child); - } - - } else if (!file.exists()) { - return true; - } - - return result & file.delete(); - } + private static boolean deleteFiles(final File file) { + boolean result = true; + if (file.isDirectory()) { + + final File[] files = file.listFiles(); + if (files != null) { + for (final File child : files) { + result &= deleteFiles(child); + } + } + } else if (!file.exists()) { + return true; + } + + return result & file.delete(); + } private static class EventCollector implements AvroSourceProtocol { private final LinkedBlockingQueue<AvroFlumeEvent> eventQueue = new LinkedBlockingQueue<>(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/17b5c8a0/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentPerf.java ---------------------------------------------------------------------- diff --git a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentPerf.java b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentPerf.java index 01b35a1..2267bc8 100644 --- a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentPerf.java +++ b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentPerf.java @@ -148,21 +148,22 @@ public class FlumePersistentPerf { } - private static boolean deleteFiles(final File file) { - boolean result = true; - if (file.isDirectory()) { - - final File[] files = file.listFiles(); - for (final File child : files) { - result &= deleteFiles(child); - } - - } else if (!file.exists()) { - return true; - } - - return result & file.delete(); - } + private static boolean deleteFiles(final File file) { + boolean result = true; + if (file.isDirectory()) { + + final File[] files = file.listFiles(); + if (files != null) { + for (final File child : files) { + result &= deleteFiles(child); + } + } + } else if (!file.exists()) { + return true; + } + + return result & file.delete(); + } private static class EventCollector implements AvroSourceProtocol { private final LinkedBlockingQueue<AvroFlumeEvent> eventQueue = new LinkedBlockingQueue<>();
