java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
New commits: commit 7db832383c8b9e2b6b5d258a15be08918716b32a Author: Lukas Zapletal lzap+git@redhat.com Date: Mon Sep 20 09:23:21 2010 +0200
fixed NPE when spacewalk_reposync_logpath is set to nonexisting dir
diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java index 397a8e2..3f4c6c3 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java +++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java @@ -2825,7 +2825,11 @@ public class ChannelManager extends BaseManager {
File dir = new File(logPath); List<String> possibleList = new ArrayList<String>(); - for (String file : dir.list()) { + String[] dirList = dir.list(); + if (dirList == null) { + return null; // the log directory does not exist + } + for (String file : dirList) { if (file.contains(c.getLabel())) { possibleList.add(file); }