Merge branch 'master' of ssh://gparabola/srv/git/abslibre

1 files changed, 0 insertions, 23 deletions

diff --git a/libre/apache-ant-libre/ant_diagnostics.patch b/libre/apache-ant-libre/ant_diagnostics.patch
deleted file mode 100644
index 38148b45c..000000000
--- a/libre/apache-ant-libre/ant_diagnostics.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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);