From f2453ec2ace86c094f619eaf311d1a38734ea7d5 Mon Sep 17 00:00:00 2001
From: Steve Loughran <stevel@apache.org>
Date: Fri, 29 Oct 2010 14:05:05 +0000
Subject: [PATCH] Bugzilla Report 48835 StringUtils.parseHumanSizes() should
 turn parse failures into  BuildExceptions.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1028755 13f79535-47bb-0310-9956-ffa450edef68
---
 WHATSNEW                                            | 4 ++++
 src/main/org/apache/tools/ant/util/StringUtils.java | 8 +++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/WHATSNEW b/WHATSNEW
index 00de20e3e..0dddcbf00 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -254,6 +254,10 @@ Other changes:
    in verbose runs.
    Bugzilla Report 48836.
 
+ * StringUtils.parseHumanSizes() should turn parse failures into
+   BuildExceptions.
+   Bugzilla Report 48835.
+
 Changes from Ant 1.8.0 TO Ant 1.8.1 
 ===================================
 
diff --git a/src/main/org/apache/tools/ant/util/StringUtils.java b/src/main/org/apache/tools/ant/util/StringUtils.java
index 6fd84b25e..5887d9377 100644
--- a/src/main/org/apache/tools/ant/util/StringUtils.java
+++ b/src/main/org/apache/tools/ant/util/StringUtils.java
@@ -17,6 +17,8 @@
  */
 package org.apache.tools.ant.util;
 
+import org.apache.tools.ant.BuildException;
+
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.Vector;
@@ -239,7 +241,11 @@ public final class StringUtils {
             }
             humanSize = humanSize.substring(0, humanSize.length() - trim);
         }
-        return factor * Long.parseLong(humanSize);
+        try {
+            return factor * Long.parseLong(humanSize);
+        } catch (NumberFormatException e) {
+            throw new BuildException("Failed to parse \"" + humanSize + "\"", e);
+        }
     }
 
     /**