You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2016/09/07 07:21:20 UTC
karaf git commit: KARAF-4700 - Overrides and blacklist cause
exceptions to be logged in the default distribution
Repository: karaf
Updated Branches:
refs/heads/master a1ad5b8ed -> b48888370
KARAF-4700 - Overrides and blacklist cause exceptions to be logged in the default distribution
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/b4888837
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/b4888837
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/b4888837
Branch: refs/heads/master
Commit: b48888370f283688235dbd029fab5ab63b578d74
Parents: a1ad5b8
Author: Guillaume Nodet <gn...@apache.org>
Authored: Wed Sep 7 09:20:19 2016 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Wed Sep 7 09:20:29 2016 +0200
----------------------------------------------------------------------
.../org/apache/karaf/features/internal/service/Blacklist.java | 5 ++++-
.../org/apache/karaf/features/internal/service/Overrides.java | 3 +++
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/b4888837/features/core/src/main/java/org/apache/karaf/features/internal/service/Blacklist.java
----------------------------------------------------------------------
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/service/Blacklist.java b/features/core/src/main/java/org/apache/karaf/features/internal/service/Blacklist.java
index ae40e3a..d5ad84c 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/service/Blacklist.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/service/Blacklist.java
@@ -17,6 +17,7 @@
package org.apache.karaf.features.internal.service;
import java.io.BufferedReader;
+import java.io.FileNotFoundException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URL;
@@ -128,8 +129,10 @@ public class Blacklist {
}
}
}
+ } catch (FileNotFoundException e) {
+ LOGGER.debug("Unable to load blacklist bundles list", e.toString());
} catch (Exception e) {
- LOGGER.debug("Unable to load overrides bundles list", e);
+ LOGGER.debug("Unable to load blacklist bundles list", e);
}
return blacklist;
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/b4888837/features/core/src/main/java/org/apache/karaf/features/internal/service/Overrides.java
----------------------------------------------------------------------
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/service/Overrides.java b/features/core/src/main/java/org/apache/karaf/features/internal/service/Overrides.java
index c703fd0..58fdbae 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/service/Overrides.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/service/Overrides.java
@@ -17,6 +17,7 @@
package org.apache.karaf.features.internal.service;
import java.io.BufferedReader;
+import java.io.FileNotFoundException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URL;
@@ -125,6 +126,8 @@ public final class Overrides {
}
}
}
+ } catch (FileNotFoundException e) {
+ LOGGER.debug("Unable to load overrides bundles list", e.toString());
} catch (Exception e) {
LOGGER.debug("Unable to load overrides bundles list", e);
}