Attachment 33629 Details for Bug 59130 – Patch

[patch] Patch

0001-Fix-issue-59190-Definer-s-way-to-parse-URLs-from-cla.patch (text/plain), 1.46 KB, created by Uwe Schindler (ASF) on 2016-03-05 22:33:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Uwe Schindler (ASF)

Created: 2016-03-05 22:33:19 UTC

Size: 1.46 KB

patch

obsolete

>From fe34d2024cf6e54a8e628b558399981b34f9774b Mon Sep 17 00:00:00 2001
>From: Uwe Schindler <uschindler@apache.org>
>Date: Sat, 5 Mar 2016 23:30:13 +0100
>Subject: [PATCH] Fix issue 59190: Definer's way to parse URLs from classloader
> breaks with recent Java 9 builds (b108)
>
>---
> WHATSNEW                                            | 4 ++++
> src/main/org/apache/tools/ant/taskdefs/Definer.java | 2 +-
> 2 files changed, 5 insertions(+), 1 deletion(-)
>
>diff --git a/WHATSNEW b/WHATSNEW
>index f7c2b9b..7dff8cb 100644
>--- a/WHATSNEW
>+++ b/WHATSNEW
>@@ -56,6 +56,10 @@ Fixed bugs:
>  * Ant fails to run if ANT_HOME contains a double-quote character.
>    Bugzilla Report 58874
> 
>+ * Definer's way to parse URLs from classloader breaks with
>+   recent Java 9 builds (b108).
>+   Bugzilla Report 59130
>+
> Other changes:
> --------------
> 
>diff --git a/src/main/org/apache/tools/ant/taskdefs/Definer.java b/src/main/org/apache/tools/ant/taskdefs/Definer.java
>index 8196fa5..e4e3ea3 100644
>--- a/src/main/org/apache/tools/ant/taskdefs/Definer.java
>+++ b/src/main/org/apache/tools/ant/taskdefs/Definer.java
>@@ -256,7 +256,7 @@ public abstract class Definer extends DefBase {
>                 URL url = urls.nextElement();
> 
>                 int fmt = this.format;
>-                if (url.toString().toLowerCase(Locale.ENGLISH).endsWith(".xml")) {
>+                if (url.getPath().toLowerCase(Locale.ENGLISH).endsWith(".xml")) {
>                     fmt = Format.XML;
>                 }
> 
>-- 
>2.7.0.windows.1
>

Actions: View | Diff

Attachments on bug 59130: 33629