Author: ludovicc-guest Date: 2010-02-20 22:45:11 +0000 (Sat, 20 Feb 2010) New Revision: 11658
Added: trunk/ant/debian/patches/ant_diagnostics.patch Modified: trunk/ant/debian/changelog trunk/ant/debian/control trunk/ant/debian/patches/series Log: Fix a NPE on Diagnostics.getClassLocation(), add patch ant_diagnostics.patch for it (Closes: #570588) Modified: trunk/ant/debian/changelog =================================================================== --- trunk/ant/debian/changelog 2010-02-20 22:43:13 UTC (rev 11657) +++ trunk/ant/debian/changelog 2010-02-20 22:45:11 UTC (rev 11658) @@ -1,9 +1,14 @@ ant (1.8.0-2) unstable; urgency=low + [Torsten Werner] * Improve Description of ant-gcj thanks to Matthias Klose. - -- Torsten Werner <[email protected]> Sat, 20 Feb 2010 10:54:07 +0100 + [Ludovic Claude] + * Fix a NPE on Diagnostics.getClassLocation(), add patch + ant_diagnostics.patch for it (Closes: #570588) + -- Ludovic Claude <[email protected]> Sat, 20 Feb 2010 23:32:07 +0100 + ant (1.8.0-1) unstable; urgency=low * New upstream version Modified: trunk/ant/debian/control =================================================================== --- trunk/ant/debian/control 2010-02-20 22:43:13 UTC (rev 11657) +++ trunk/ant/debian/control 2010-02-20 22:45:11 UTC (rev 11658) @@ -34,8 +34,7 @@ Depends: ant, ${misc:Depends}, ${shlibs:Depends} Description: Java based build tool like make A system independent (i.e. not shell based) build tool that uses XML - files as "Makefiles". This package contains the scripts and the core - tasks libraries compiled natively. + files as "Makefiles". . This package contains a native version of ant built using gcj. Added: trunk/ant/debian/patches/ant_diagnostics.patch =================================================================== --- trunk/ant/debian/patches/ant_diagnostics.patch (rev 0) +++ trunk/ant/debian/patches/ant_diagnostics.patch 2010-02-20 22:45:11 UTC (rev 11658) @@ -0,0 +1,23 @@ +--- a/src/main/org/apache/tools/ant/Diagnostics.java ++++ b/src/main/org/apache/tools/ant/Diagnostics.java +@@ -179,7 +179,10 @@ + * @param clazz the class to get the information from. + * @since Ant 1.8.0 + */ +- private static URL getClassLocation(Class clazz) { ++ private static URL getClassLocation(Class clazz) { ++ if (clazz.getProtectionDomain().getCodeSource() == null) { ++ return null; ++ } + return clazz.getProtectionDomain().getCodeSource().getLocation(); + } + +@@ -241,7 +244,7 @@ + } + Transformer transformer = null; + try { +- transformer = transformerFactory.newTransformer(); ++ transformer = transformerFactory.newTransformer(); + } catch (Exception e) { + // ignore + ignoreThrowable(e); Modified: trunk/ant/debian/patches/series =================================================================== --- trunk/ant/debian/patches/series 2010-02-20 22:43:13 UTC (rev 11657) +++ trunk/ant/debian/patches/series 2010-02-20 22:45:11 UTC (rev 11658) @@ -6,3 +6,4 @@ gjdoc_task.patch ant_home_path.patch build-path.patch +ant_diagnostics.patch _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
