Repository: tomee Updated Branches: refs/heads/tomee-1.7.x cbf482a8d -> 6c905096d
Use logger where possible + PMD Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/6c905096 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/6c905096 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/6c905096 Branch: refs/heads/tomee-1.7.x Commit: 6c905096d60f3693d28086ac1cee11719192841c Parents: cbf482a Author: AndyGee <[email protected]> Authored: Mon Sep 14 21:43:23 2015 +0200 Committer: AndyGee <[email protected]> Committed: Mon Sep 14 21:43:23 2015 +0200 ---------------------------------------------------------------------- .../java/org/apache/openejb/assembler/classic/Assembler.java | 5 +++-- .../src/main/java/org/apache/openejb/loader/SystemInstance.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/6c905096/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java index 7ee33e1..a44cabc 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java @@ -2186,10 +2186,11 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A if (null != m) { try { m.invoke(null); + logger.info("Reset slf4j on application undeployment"); } catch (final InvocationTargetException e) { - System.out.println("Assembler.resetSlf4j: " + e.getMessage()); + logger.warning("Assembler.resetSlf4j: " + e.getMessage()); } catch (final IllegalAccessException e) { - System.out.println("Assembler.resetSlf4j: " + e.getMessage()); + logger.warning("Assembler.resetSlf4j: " + e.getMessage()); } } } http://git-wip-us.apache.org/repos/asf/tomee/blob/6c905096/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java ---------------------------------------------------------------------- diff --git a/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java b/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java index cb638c5..4a84f6c 100644 --- a/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java +++ b/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java @@ -68,7 +68,7 @@ public final class SystemInstance { this.components = new HashMap<Class, Object>(); // import JVM system property config (if a resource/container/... is set through this way) - Properties clonedSystemProperties = (Properties) System.getProperties().clone(); + final Properties clonedSystemProperties = (Properties) System.getProperties().clone(); for (final Map.Entry<Object, Object> e : clonedSystemProperties.entrySet()) { final String key = e.getKey().toString(); if (key.startsWith("sun.")) {
