From 3c045b38b0fe6b7c031d5235a06d50d84c351447 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Thu, 12 Oct 2000 13:38:15 +0000
Subject: [PATCH] Make sure a BuildException thrown inside a <script> doesn't
 get wrapped into yet another BuildException.

Submitted by:	Nico Seessle <nico@seessle.de>


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268078 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/tools/ant/taskdefs/optional/Script.java   | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Script.java b/src/main/org/apache/tools/ant/taskdefs/optional/Script.java
index 86ddc12fd..9ef133de8 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/Script.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/Script.java
@@ -109,10 +109,16 @@ public class Script extends Task {
             // execute the script
             manager.exec(language, "<ANT>", 0, 0, script);
         } catch (BSFException be) {
-	    Exception e = be;
+	    Throwable t = be;
             Throwable te = be.getTargetException();
-            if (te != null && te instanceof Exception) e = (Exception) te;
-            throw new BuildException(e);
+            if (te != null) {
+                if  (te instanceof BuildException) {
+                    throw (BuildException) te;
+                } else {
+                    t = te;
+                }
+            }
+            throw new BuildException(t);
         }
     }