From 7b9ca06ea2e80232546c804639b93f896a3bd7f6 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Wed, 21 Dec 2016 11:00:48 +0100
Subject: [PATCH] extract assignment statements

---
 src/main/org/apache/tools/ant/filters/UniqFilter.java      | 7 +++++--
 src/main/org/apache/tools/ant/taskdefs/Sync.java           | 3 ++-
 .../ant/taskdefs/optional/junit/AggregateTransformer.java  | 6 ++++--
 src/main/org/apache/tools/bzip2/BlockSort.java             | 6 ++++--
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/main/org/apache/tools/ant/filters/UniqFilter.java b/src/main/org/apache/tools/ant/filters/UniqFilter.java
index e72d5f581..2983b6c90 100644
--- a/src/main/org/apache/tools/ant/filters/UniqFilter.java
+++ b/src/main/org/apache/tools/ant/filters/UniqFilter.java
@@ -31,7 +31,10 @@ public class UniqFilter extends TokenFilter.ChainableReaderFilter {
     private String lastLine = null;
 
     public String filter(String string) {
-        return lastLine == null || !lastLine.equals(string)
-            ? (lastLine = string) : null;
+        if (lastLine == null || !lastLine.equals(string)) {
+            lastLine = string;
+            return lastLine;
+        }
+        return null;
     }
 }
diff --git a/src/main/org/apache/tools/ant/taskdefs/Sync.java b/src/main/org/apache/tools/ant/taskdefs/Sync.java
index c1c755291..bcdfd525c 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Sync.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Sync.java
@@ -403,7 +403,8 @@ public class Sync extends Task {
             if (resources == null) {
                 Restrict r = new Restrict();
                 r.add(new Exists());
-                r.add(resources = new Resources());
+                resources = new Resources();
+                r.add(resources);
                 myCopy.add(r);
             }
             resources.add(rc);
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java
index 32dd7043a..ca4707458 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java
@@ -236,8 +236,10 @@ public class AggregateTransformer {
      * @since Ant 1.9.5
      */
     public XSLTProcess.Factory createFactory() {
-        return xsltFactory != null ? xsltFactory
-            : (xsltFactory = xsltTask.createFactory());
+        if (xsltFactory == null) {
+            xsltFactory = xsltTask.createFactory();
+        }
+        return xsltFactory;
     }
 
     /**
diff --git a/src/main/org/apache/tools/bzip2/BlockSort.java b/src/main/org/apache/tools/bzip2/BlockSort.java
index 78ea15e31..b382470f8 100644
--- a/src/main/org/apache/tools/bzip2/BlockSort.java
+++ b/src/main/org/apache/tools/bzip2/BlockSort.java
@@ -445,8 +445,10 @@ class BlockSort {
     private int[] eclass;
 
     private int[] getEclass() {
-        return eclass == null
-            ? (eclass = new int[quadrant.length / 2]) : eclass;
+        if (eclass == null) {
+            eclass = new int[quadrant.length / 2];
+        }
+        return eclass;
     }
 
     /*