From a2cedaed6c1a36e3550cc939393a9d77b3bb28ac Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Sat, 24 Oct 2009 05:28:12 +0000 Subject: [PATCH] Same fix as for AncestorAnalyzer - make code compile with BCEL's trunk git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@829307 13f79535-47bb-0310-9956-ffa450edef68 --- .../tools/ant/util/depend/bcel/FullAnalyzer.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.java b/src/main/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.java index 324a85c12..865ca4426 100644 --- a/src/main/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.java +++ b/src/main/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.java @@ -24,6 +24,7 @@ import java.util.Vector; import org.apache.bcel.classfile.ClassParser; import org.apache.bcel.classfile.DescendingVisitor; import org.apache.bcel.classfile.JavaClass; +import org.apache.tools.ant.BuildException; import org.apache.tools.ant.util.depend.AbstractAnalyzer; /** @@ -41,8 +42,13 @@ public class FullAnalyzer extends AbstractAnalyzer { // force BCEL classes to load now try { new ClassParser("force"); - } catch (IOException e) { - // ignore + } catch (Exception e) { + // all released versions of BCEL may throw an IOException + // here, but BCEL's trunk does no longer declare to do so + if (!(e instanceof IOException)) { + throw new BuildException(e); + } + // ignore IOException like we've always done } }