Updated Branches: refs/heads/flume-1.4 715e8e6d1 -> 30d9ca313
FLUME-1664. Logutils.getLogs remove unneeded directory check. (Brock Noland via Hari Shreedharan) Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/30d9ca31 Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/30d9ca31 Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/30d9ca31 Branch: refs/heads/flume-1.4 Commit: 30d9ca3135d29d764ac1de07aa4274c6db0d8978 Parents: 715e8e6 Author: Hari Shreedharan <[email protected]> Authored: Thu Oct 25 23:26:44 2012 -0400 Committer: Hari Shreedharan <[email protected]> Committed: Thu Oct 25 23:31:08 2012 -0400 ---------------------------------------------------------------------- .../org/apache/flume/channel/file/LogUtils.java | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/30d9ca31/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/LogUtils.java ---------------------------------------------------------------------- diff --git a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/LogUtils.java b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/LogUtils.java index 4f5d3cc..d1498c2 100644 --- a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/LogUtils.java +++ b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/LogUtils.java @@ -65,14 +65,11 @@ public class LogUtils { List<File> result = Lists.newArrayList(); File[] files = logDir.listFiles(); if(files == null) { - if(!logDir.isDirectory()) { - String msg = "Path " + logDir + " is not a directory: "; - msg += "File = " + logDir.isFile() + ", "; - msg += "Exists = " + logDir.exists() + ", "; - msg += "Writable = " + logDir.canWrite(); - throw new IllegalStateException(msg); - } - return result; + String msg = logDir + ".listFiles() returned null: "; + msg += "File = " + logDir.isFile() + ", "; + msg += "Exists = " + logDir.exists() + ", "; + msg += "Writable = " + logDir.canWrite(); + throw new IllegalStateException(msg); } for (File file : files) { String name = file.getName();
