From 0ad2609358b127bbeba03c4d8c0e89ad3443dda8 Mon Sep 17 00:00:00 2001
From: Arturo Bernal <arturobernalg@gmail.com>
Date: Tue, 31 Aug 2021 21:03:12 +0200
Subject: [PATCH] Simplify single assignment and avoid redundant if 
 conditions.

---
 src/main/org/apache/tools/ant/taskdefs/Tar.java         | 5 +----
 src/main/org/apache/tools/ant/taskdefs/XmlProperty.java | 7 ++-----
 src/main/org/apache/tools/ant/types/Permissions.java    | 5 +----
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/main/org/apache/tools/ant/taskdefs/Tar.java b/src/main/org/apache/tools/ant/taskdefs/Tar.java
index 76446fdc8..9d1cdf4c0 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Tar.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Tar.java
@@ -635,10 +635,7 @@ public class Tar extends MatchingTask {
      * @since Ant 1.7
      */
     protected boolean check(final File basedir, final String[] files) {
-        boolean upToDate = true;
-        if (!archiveIsUpToDate(files, basedir)) {
-            upToDate = false;
-        }
+        boolean upToDate = archiveIsUpToDate(files, basedir);
 
         for (String file : files) {
             if (tarFile.equals(new File(basedir, file))) {
diff --git a/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java b/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java
index 4a86ca0b9..4e07c3a97 100644
--- a/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java
+++ b/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java
@@ -404,17 +404,14 @@ public class XmlProperty extends Task {
         }
         String nodeText = null;
         boolean emptyNode = false;
-        boolean semanticEmptyOverride = false;
-        if (node.getNodeType() == Node.ELEMENT_NODE
+        boolean semanticEmptyOverride = node.getNodeType() == Node.ELEMENT_NODE
                 && semanticAttributes
                 && node.hasAttributes()
                 && (node.getAttributes().getNamedItem(VALUE) != null
                         || node.getAttributes().getNamedItem(LOCATION) != null
                         || node.getAttributes().getNamedItem(REF_ID) != null
                         || node.getAttributes().getNamedItem(PATH) != null || node.getAttributes()
-                        .getNamedItem(PATHID) != null)) {
-            semanticEmptyOverride = true;
-        }
+                        .getNamedItem(PATHID) != null);
         if (node.getNodeType() == Node.TEXT_NODE) {
             // For the text node, add a property.
             nodeText = getAttributeValue(node);
diff --git a/src/main/org/apache/tools/ant/types/Permissions.java b/src/main/org/apache/tools/ant/types/Permissions.java
index 1d94388ce..b61d9f6c1 100644
--- a/src/main/org/apache/tools/ant/types/Permissions.java
+++ b/src/main/org/apache/tools/ant/types/Permissions.java
@@ -207,10 +207,7 @@ public class Permissions {
         public void checkPermission(final java.security.Permission perm) {
             if (active) {
                 if (delegateToOldSM && !perm.getName().equals("exitVM")) {
-                    boolean permOK = false;
-                    if (granted.implies(perm)) {
-                        permOK = true;
-                    }
+                    boolean permOK = granted.implies(perm);
                     checkRevoked(perm);
                     /*
                      if the permission was not explicitly granted or revoked