karaf git commit: [KARAF-3432] Fix properties test from the etc/org.apache.karaf.shell.cfg

[jbonofre]

Repository: karaf
Updated Branches:
  refs/heads/karaf-3.0.x aea27bc77 -> 54bd50f8e


[KARAF-3432] Fix properties test from the etc/org.apache.karaf.shell.cfg


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/54bd50f8
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/54bd50f8
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/54bd50f8

Branch: refs/heads/karaf-3.0.x
Commit: 54bd50f8ee7d05cd21a649d6143328d55d732d25
Parents: aea27bc
Author: Jean-Baptiste Onofré <jbono...@apache.org>
Authored: Fri Jan 9 15:51:27 2015 +0100
Committer: Jean-Baptiste Onofré <jbono...@apache.org>
Committed: Fri Jan 9 15:51:27 2015 +0100

----------------------------------------------------------------------
 .../org/apache/karaf/shell/console/impl/jline/ConsoleImpl.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/54bd50f8/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/ConsoleImpl.java
----------------------------------------------------------------------
diff --git 
a/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/ConsoleImpl.java
 
b/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/ConsoleImpl.java
index 7f18a8e..3b05a1b 100644
--- 
a/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/ConsoleImpl.java
+++ 
b/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/ConsoleImpl.java
@@ -237,17 +237,17 @@ public class ConsoleImpl implements Console {
             properties.load(new FileInputStream(shellCfg));
             if (properties.get("consoleLogger") != null && ((String) 
properties.get("consoleLogger")).equalsIgnoreCase("true")) {
                 consoleLogger = true;
-                if (properties.get("consoleLoggerName") != null && ((String) 
properties.get("consoleLoggerName")).isEmpty()) {
+                if (properties.get("consoleLoggerName") != null && !((String) 
properties.get("consoleLoggerName")).isEmpty()) {
                     consoleLoggerName = (String) 
properties.get("consoleLoggerName");
                 } else {
                     consoleLoggerName = 
"org.apache.karaf.shell.console.Logger";
                 }
-                if (properties.get("consoleLoggerOutLevel") != null && 
((String) properties.get("consoleLoggerOutLevel")).isEmpty()) {
+                if (properties.get("consoleLoggerOutLevel") != null && 
!((String) properties.get("consoleLoggerOutLevel")).isEmpty()) {
                     consoleLoggerOutLevel = (String) 
properties.get("consoleLoggerOutLevel");
                 } else {
                     consoleLoggerOutLevel = "trace";
                 }
-                if (properties.get("consoleLoggerErrLevel") != null && 
((String) properties.get("consoleLoggerErrLevel")).isEmpty()) {
+                if (properties.get("consoleLoggerErrLevel") != null && 
!((String) properties.get("consoleLoggerErrLevel")).isEmpty()) {
                     consoleLoggerErrLevel = (String) 
properties.get("consoleLoggerErrLevel");
                 } else {
                     consoleLoggerErrLevel = "error";