Repository: karaf Updated Branches: refs/heads/master ee96f837a -> 0c1218406
[KARAF-3404] Fix possible NPE Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/0c121840 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/0c121840 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/0c121840 Branch: refs/heads/master Commit: 0c1218406bf44d8501aaba531cb4437d474dc843 Parents: db1143e Author: Guillaume Nodet <[email protected]> Authored: Thu Jan 8 10:01:08 2015 +0100 Committer: Guillaume Nodet <[email protected]> Committed: Thu Jan 8 10:01:46 2015 +0100 ---------------------------------------------------------------------- profile/src/main/java/org/apache/karaf/profile/impl/Profiles.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/0c121840/profile/src/main/java/org/apache/karaf/profile/impl/Profiles.java ---------------------------------------------------------------------- diff --git a/profile/src/main/java/org/apache/karaf/profile/impl/Profiles.java b/profile/src/main/java/org/apache/karaf/profile/impl/Profiles.java index 1f6b507..7f8d483 100644 --- a/profile/src/main/java/org/apache/karaf/profile/impl/Profiles.java +++ b/profile/src/main/java/org/apache/karaf/profile/impl/Profiles.java @@ -52,7 +52,8 @@ public final class Profiles { ProfileBuilder builder; @Override public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException { - if (dir.getFileName().toString().endsWith(PROFILE_FOLDER_SUFFIX)) { + Path fileName = dir.getFileName(); + if (fileName != null && fileName.toString().endsWith(PROFILE_FOLDER_SUFFIX)) { String profileId = root.relativize(dir).toString(); profileId = profileId.replaceAll(root.getFileSystem().getSeparator(), "-"); profileId = profileId.substring(0, profileId.length() - PROFILE_FOLDER_SUFFIX.length());
