From 7081e356a86317bf32635888a6d3cf340dfa9a67 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Thu, 22 Dec 2016 07:11:31 +0100
Subject: [PATCH] stick with RuntimeExceptions to prevent recursive logging
 loops

---
 src/main/org/apache/tools/ant/XmlLogger.java                | 6 +++---
 src/main/org/apache/tools/ant/listener/MailLogger.java      | 4 ++--
 src/main/org/apache/tools/ant/taskdefs/LogOutputStream.java | 2 +-
 src/main/org/apache/tools/ant/util/DOMElementWriter.java    | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/org/apache/tools/ant/XmlLogger.java b/src/main/org/apache/tools/ant/XmlLogger.java
index a67a260ed..d03067d13 100644
--- a/src/main/org/apache/tools/ant/XmlLogger.java
+++ b/src/main/org/apache/tools/ant/XmlLogger.java
@@ -264,7 +264,7 @@ public class XmlLogger implements BuildLogger {
             if (!threadStack.empty()) {
                 TimedElement poppedStack = threadStack.pop();
                 if (poppedStack != targetElement) {
-                    throw new RuntimeException("Mismatch - popped element = " + poppedStack
+                    throw new RuntimeException("Mismatch - popped element = " + poppedStack //NOSONAR
                             + " finished target element = " + targetElement);
                 }
                 if (!threadStack.empty()) {
@@ -316,7 +316,7 @@ public class XmlLogger implements BuildLogger {
         Task task = event.getTask();
         TimedElement taskElement = tasks.get(task);
         if (taskElement == null) {
-            throw new RuntimeException("Unknown task " + task + " not in " + tasks);
+            throw new RuntimeException("Unknown task " + task + " not in " + tasks); //NOSONAR
         }
         long totalTime = System.currentTimeMillis() - taskElement.startTime;
         taskElement.element.setAttribute(TIME_ATTR, DefaultLogger.formatTime(totalTime));
@@ -334,7 +334,7 @@ public class XmlLogger implements BuildLogger {
         if (!threadStack.empty()) {
             TimedElement poppedStack = threadStack.pop();
             if (poppedStack != taskElement) {
-                throw new RuntimeException("Mismatch - popped element = " + poppedStack
+                throw new RuntimeException("Mismatch - popped element = " + poppedStack //NOSONAR
                         + " finished task element = " + taskElement);
             }
         }
diff --git a/src/main/org/apache/tools/ant/listener/MailLogger.java b/src/main/org/apache/tools/ant/listener/MailLogger.java
index 3d5bcd235..45289a1c4 100644
--- a/src/main/org/apache/tools/ant/listener/MailLogger.java
+++ b/src/main/org/apache/tools/ant/listener/MailLogger.java
@@ -327,7 +327,7 @@ public class MailLogger extends DefaultLogger {
      *      property is not present in properties.
      */
     private String getValue(Hashtable<String, Object> properties, String name,
-                            String defaultValue) throws Exception {
+                            String defaultValue) {
         String propertyName = "MailLogger." + name;
         String value = (String) properties.get(propertyName);
 
@@ -336,7 +336,7 @@ public class MailLogger extends DefaultLogger {
         }
 
         if (value == null) {
-            throw new Exception("Missing required parameter: " + propertyName);
+            throw new RuntimeException("Missing required parameter: " + propertyName); //NOSONAR
         }
 
         return value;
diff --git a/src/main/org/apache/tools/ant/taskdefs/LogOutputStream.java b/src/main/org/apache/tools/ant/taskdefs/LogOutputStream.java
index b2c34684d..23bb6bd15 100644
--- a/src/main/org/apache/tools/ant/taskdefs/LogOutputStream.java
+++ b/src/main/org/apache/tools/ant/taskdefs/LogOutputStream.java
@@ -77,7 +77,7 @@ public class LogOutputStream extends LineOrientedOutputStream {
             super.processBuffer();
         } catch (IOException e) {
             // impossible since *our* processLine doesn't throw an IOException
-            throw new RuntimeException("Impossible IOException caught: " + e);
+            throw new RuntimeException("Impossible IOException caught: " + e); //NOSONAR
         }
     }
 
diff --git a/src/main/org/apache/tools/ant/util/DOMElementWriter.java b/src/main/org/apache/tools/ant/util/DOMElementWriter.java
index 14cbaee2b..cafecf03f 100644
--- a/src/main/org/apache/tools/ant/util/DOMElementWriter.java
+++ b/src/main/org/apache/tools/ant/util/DOMElementWriter.java
@@ -494,7 +494,7 @@ public class DOMElementWriter {
         try {
             encodedata(out, value);
         } catch (IOException ex) {
-            throw new RuntimeException(ex);
+            throw new RuntimeException(ex); //NOSONAR
         }
         return out.toString();
     }