Author: bodewig
Date: Wed Oct 21 05:40:07 2009
New Revision: 827887
URL: http://svn.apache.org/viewvc?rev=827887&view=rev
Log:
adapt to BCEL change, see dist-ant's Gump build failure
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.java
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.java?rev=827887&r1=827886&r2=827887&view=diff
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.java
Wed Oct 21 05:40:07 2009
@@ -23,6 +23,7 @@
import java.util.Vector;
import org.apache.bcel.classfile.ClassParser;
import org.apache.bcel.classfile.JavaClass;
+import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.util.depend.AbstractAnalyzer;
/**
@@ -42,8 +43,13 @@
// 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
}
}