Repository: ant
Updated Branches:
  refs/heads/master 0d58df76f -> 7b9ca06ea


I disagree with Sonar - moving the assignment make the code worse


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

Branch: refs/heads/master
Commit: ef80b111c43f8eab075475a2a60031d45b24754a
Parents: 0d58df7
Author: Stefan Bodewig <[email protected]>
Authored: Wed Dec 21 10:59:48 2016 +0100
Committer: Stefan Bodewig <[email protected]>
Committed: Wed Dec 21 10:59:48 2016 +0100

----------------------------------------------------------------------
 src/main/org/apache/tools/ant/taskdefs/Expand.java           | 2 +-
 .../org/apache/tools/ant/taskdefs/optional/NetRexxC.java     | 2 +-
 src/main/org/apache/tools/bzip2/BlockSort.java               | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant/blob/ef80b111/src/main/org/apache/tools/ant/taskdefs/Expand.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Expand.java 
b/src/main/org/apache/tools/ant/taskdefs/Expand.java
index cb0c958..0ec2333 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 {

http://git-wip-us.apache.org/repos/asf/ant/blob/ef80b111/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
----------------------------------------------------------------------
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 5ba2a76..21440f1 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));

http://git-wip-us.apache.org/repos/asf/ant/blob/ef80b111/src/main/org/apache/tools/bzip2/BlockSort.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/bzip2/BlockSort.java 
b/src/main/org/apache/tools/bzip2/BlockSort.java
index eb9066e..78ea15e 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++;

Reply via email to