[karaf] branch master updated: Fix ternary precedence

[jbonofre]

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/master by this push:
     new ac7d70f  Fix ternary precedence
     new 58d5139  Merge pull request #1010 from skitt/ternary-bugs
ac7d70f is described below

commit ac7d70fc3400ebc3adb418f59b822f567f019bfe
Author: Stephen Kitt <sk...@redhat.com>
AuthorDate: Tue Dec 17 13:48:38 2019 +0100

    Fix ternary precedence
    
    Message construction in two instances of getNiceHelp() is incorrect,
    because of precedence in ternary operator arguments:
    
        X + getMessage() != null ? getMessage() : getClass().getName()
    
    tests X + getMessage(), not getMessage(). This patch adds parentheses
    to group the operations correctly.
    
    Signed-off-by: Stephen Kitt <sk...@redhat.com>
---
 .../src/main/java/org/apache/felix/gogo/commands/CommandException.java  | 2 +-
 .../src/main/java/org/apache/karaf/shell/commands/CommandException.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/shell/console/src/main/java/org/apache/felix/gogo/commands/CommandException.java
 
b/shell/console/src/main/java/org/apache/felix/gogo/commands/CommandException.java
index 3c02d63..d01e939 100644
--- 
a/shell/console/src/main/java/org/apache/felix/gogo/commands/CommandException.java
+++ 
b/shell/console/src/main/java/org/apache/felix/gogo/commands/CommandException.java
@@ -56,7 +56,7 @@ public class CommandException extends Exception {
     public String getNiceHelp() {
         return help != null ? help
                 : SimpleAnsi.COLOR_RED + "Error executing command: " 
-                 + getMessage() != null ? getMessage() : getClass().getName()
+                 + (getMessage() != null ? getMessage() : getClass().getName())
                  + SimpleAnsi.COLOR_DEFAULT;
     }
 
diff --git 
a/shell/console/src/main/java/org/apache/karaf/shell/commands/CommandException.java
 
b/shell/console/src/main/java/org/apache/karaf/shell/commands/CommandException.java
index 41280bd..8675aa3 100644
--- 
a/shell/console/src/main/java/org/apache/karaf/shell/commands/CommandException.java
+++ 
b/shell/console/src/main/java/org/apache/karaf/shell/commands/CommandException.java
@@ -58,7 +58,7 @@ public class CommandException extends Exception {
     public String getNiceHelp() {
         return  help != null ? help
                     : SimpleAnsi.COLOR_RED + "Error executing command: " 
-                    + getMessage() != null ? getMessage() : 
getClass().getName()
+                    + (getMessage() != null ? getMessage() : 
getClass().getName())
                     + SimpleAnsi.COLOR_DEFAULT;
     }