From eaf3af0aea8b14c4a5d8d63bc4cb22f88dbb19a4 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Wed, 21 Dec 2016 11:22:00 +0100
Subject: [PATCH] Sonar falsely claims expressions to be constant

---
 src/main/org/apache/tools/ant/ArgumentProcessorRegistry.java    | 2 +-
 src/main/org/apache/tools/ant/taskdefs/StreamPumper.java        | 2 +-
 .../org/apache/tools/ant/taskdefs/optional/net/RExecTask.java   | 2 +-
 .../org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java  | 2 +-
 src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/org/apache/tools/ant/ArgumentProcessorRegistry.java b/src/main/org/apache/tools/ant/ArgumentProcessorRegistry.java
index ae95c3b79..0c7c35bd0 100644
--- a/src/main/org/apache/tools/ant/ArgumentProcessorRegistry.java
+++ b/src/main/org/apache/tools/ant/ArgumentProcessorRegistry.java
@@ -84,7 +84,7 @@ public class ArgumentProcessorRegistry {
             }
 
             InputStream systemResource = ClassLoader.getSystemResourceAsStream(SERVICE_ID);
-            if (systemResource != null) {
+            if (systemResource != null) { //NOSONAR
                 ArgumentProcessor processor = getProcessorByService(systemResource);
                 registerArgumentProcessor(processor);
             }
diff --git a/src/main/org/apache/tools/ant/taskdefs/StreamPumper.java b/src/main/org/apache/tools/ant/taskdefs/StreamPumper.java
index df95eedb6..59d886b79 100644
--- a/src/main/org/apache/tools/ant/taskdefs/StreamPumper.java
+++ b/src/main/org/apache/tools/ant/taskdefs/StreamPumper.java
@@ -137,7 +137,7 @@ public class StreamPumper implements Runnable {
                 if (autoflush) {
                     os.flush();
                 }
-                if (finish) {
+                if (finish) { //NOSONAR
                     break;
                 }
             }
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/RExecTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/RExecTask.java
index 61d6e3ddd..d88874f25 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/net/RExecTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/RExecTask.java
@@ -362,7 +362,7 @@ public class RExecTask extends Task {
             } catch (IOException e) {
                 throw new BuildException("Can't connect to " + server);
             }
-            if (userid != null && password != null && command != null
+            if (userid != null && password != null && command != null //NOSONAR
                 && rexecTasks.size() == 0) {
                 // simple one-shot execution
                 rexec.rexec(userid, password, command);
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java
index 2bd220540..a89e7a9c8 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java
@@ -107,7 +107,7 @@ public class TelnetTask extends Task {
                throw new BuildException("Can't connect to " + server);
            }
            /**  Login if userid and password were specified */
-           if (userid != null && password != null) {
+           if (userid != null && password != null) { //NOSONAR
                login(telnet);
            }
            /**  Process each sub command */
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
index d2a09bc68..087a4022b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
@@ -267,7 +267,7 @@ public class Scp extends SSHBase {
                 } else {
                     upload(fromUri, toUri);
                 }
-            } else if (isFromRemote && isToRemote) {
+            } else if (isFromRemote && isToRemote) { //NOSONAR
                 throw new BuildException(
                     "Copying from a remote server to a remote server is not supported.");
             } else {