summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Bodewig <bodewig@apache.org>2016-12-21 10:59:48 +0100
committerStefan Bodewig <bodewig@apache.org>2016-12-21 10:59:48 +0100
commitef80b111c43f8eab075475a2a60031d45b24754a (patch)
tree8e7a9f29a56c3a0155f721978b5126252f0522c7
parent0d58df76f65efd43b907a20e245b84e1129b1b05 (diff)
downloadant-ef80b111c43f8eab075475a2a60031d45b24754a.tar.gz
I disagree with Sonar - moving the assignment make the code worse
-rw-r--r--src/main/org/apache/tools/ant/taskdefs/Expand.java2
-rw-r--r--src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java2
-rw-r--r--src/main/org/apache/tools/bzip2/BlockSort.java8
3 files changed, 6 insertions, 6 deletions
diff --git a/src/main/org/apache/tools/ant/taskdefs/Expand.java b/src/main/org/apache/tools/ant/taskdefs/Expand.java
index cb0c958d5..0ec233308 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Expand.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Expand.java
@@ -191,7 +191,7 @@ public class Expand extends Task {
log("extracting " + ze.getName(), Project.MSG_DEBUG);
try {
extractFile(fileUtils, srcF, dir,
- is = zf.getInputStream(ze),
+ is = zf.getInputStream(ze), //NOSONAR
ze.getName(), new Date(ze.getTime()),
ze.isDirectory(), mapper);
} finally {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java b/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
index 5ba2a760e..21440f1e6 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
@@ -868,7 +868,7 @@ public class NetRexxC extends MatchingTask {
PrintWriter w = null;
int rc =
COM.ibm.netrexx.process.NetRexxC.main(new Rexx(compileArgs),
- w = new PrintWriter(out));
+ w = new PrintWriter(out)); //NOSONAR
String sdir = srcDir.getAbsolutePath();
String ddir = destDir.getAbsolutePath();
boolean doReplace = !(sdir.equals(ddir));
diff --git a/src/main/org/apache/tools/bzip2/BlockSort.java b/src/main/org/apache/tools/bzip2/BlockSort.java
index eb9066ee9..78ea15e31 100644
--- a/src/main/org/apache/tools/bzip2/BlockSort.java
+++ b/src/main/org/apache/tools/bzip2/BlockSort.java
@@ -642,7 +642,7 @@ class BlockSort {
HAMMER: while (true) {
if (onceRunned) {
fmap[j] = a;
- if ((j -= h) <= mj) {
+ if ((j -= h) <= mj) { //NOSONAR
break HAMMER;
}
} else {
@@ -660,7 +660,7 @@ class BlockSort {
if (block[i1 + 3] == block[i2 + 3]) {
if (block[i1 + 4] == block[i2 + 4]) {
if (block[i1 + 5] == block[i2 + 5]) {
- if (block[(i1 += 6)] == block[(i2 += 6)]) {
+ if (block[(i1 += 6)] == block[(i2 += 6)]) { //NOSONAR
int x = lastShadow;
X: while (x > 0) {
x -= 4;
@@ -673,10 +673,10 @@ class BlockSort {
if (quadrant[i1 + 2] == quadrant[i2 + 2]) {
if (block[i1 + 4] == block[i2 + 4]) {
if (quadrant[i1 + 3] == quadrant[i2 + 3]) {
- if ((i1 += 4) >= lastPlus1) {
+ if ((i1 += 4) >= lastPlus1) { //NOSONAR
i1 -= lastPlus1;
}
- if ((i2 += 4) >= lastPlus1) {
+ if ((i2 += 4) >= lastPlus1) { //NOSONAR
i2 -= lastPlus1;
}
workDoneShadow++;