Repository: karaf Updated Branches: refs/heads/master 01ffa23d4 -> 010e3aeb4
[KARAF-3744] Configure the Felix logger correctly Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/010e3aeb Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/010e3aeb Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/010e3aeb Branch: refs/heads/master Commit: 010e3aeb430e20796da8f22d9b383e2ad8c7c8bd Parents: 7194255 Author: Guillaume Nodet <[email protected]> Authored: Tue Mar 8 13:16:02 2016 +0100 Committer: Guillaume Nodet <[email protected]> Committed: Tue Mar 8 13:16:33 2016 +0100 ---------------------------------------------------------------------- main/src/main/java/org/apache/karaf/main/Main.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/010e3aeb/main/src/main/java/org/apache/karaf/main/Main.java ---------------------------------------------------------------------- diff --git a/main/src/main/java/org/apache/karaf/main/Main.java b/main/src/main/java/org/apache/karaf/main/Main.java index 4b4179e..1eae257 100644 --- a/main/src/main/java/org/apache/karaf/main/Main.java +++ b/main/src/main/java/org/apache/karaf/main/Main.java @@ -22,7 +22,9 @@ import java.io.BufferedReader; import java.io.File; import java.io.InputStream; import java.io.InputStreamReader; +import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import java.net.URI; import java.net.URL; import java.net.URLClassLoader; @@ -33,7 +35,6 @@ import java.util.List; import org.apache.felix.utils.properties.Properties; import java.util.StringTokenizer; -import java.util.logging.Handler; import java.util.logging.Level; import java.util.logging.Logger; @@ -253,7 +254,7 @@ public class Main { /* * KARAF-3706: disable the logger related code to avoid the exception * It needs to be revisited when the FELIX-4871 is fixed. - * + */ // Hack to set felix logger try { if (framework.getClass().getName().startsWith("org.apache.felix.")) { @@ -263,7 +264,7 @@ public class Main { Method method = logger.getClass().getDeclaredMethod("setLogger", Object.class); method.setAccessible(true); method.invoke(logger, new Object() { - public void log(ServiceReference sr, int level, String message, Throwable exception) { + public void log(int level, String message, Throwable exception) { Level lvl; switch (level) { case 1: @@ -289,7 +290,6 @@ public class Main { } catch (Throwable t) { t.printStackTrace(); } - */ framework.init(); framework.getBundleContext().addFrameworkListener(lockCallback);
