From 3c2ed1374f54be5918921d64304ca2c82ca06548 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Sat, 12 Sep 2015 22:21:49 +0200
Subject: [PATCH] Make <bunzip2> really work with non-filesystem resources

---
 .../apache/tools/ant/taskdefs/BUnzip2.java    |  4 +--
 src/tests/antunit/taskdefs/bunzip2-test.xml   | 26 +++++++++++++++++--
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java b/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java
index 323b738cf..e4a7995fa 100644
--- a/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java
+++ b/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java
@@ -56,8 +56,8 @@ public class BUnzip2 extends Unpack {
      * Do the unbzipping.
      */
     protected void extract() {
-        if (source.lastModified() > dest.lastModified()) {
-            log("Expanding " + source.getAbsolutePath() + " to "
+        if (srcResource.getLastModified() > dest.lastModified()) {
+            log("Expanding " + srcResource.getName() + " to "
                 + dest.getAbsolutePath());
 
             FileOutputStream out = null;
diff --git a/src/tests/antunit/taskdefs/bunzip2-test.xml b/src/tests/antunit/taskdefs/bunzip2-test.xml
index a9ca42376..fcf05d964 100644
--- a/src/tests/antunit/taskdefs/bunzip2-test.xml
+++ b/src/tests/antunit/taskdefs/bunzip2-test.xml
@@ -18,11 +18,33 @@
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
   <import file="../antunit-base.xml" />
 
-  <target name="testExpandArchiveWithMultipleStreams">
+  <target name="setup">
     <mkdir dir="${output}"/>
+  </target>
+
+  <target name="testExpandArchiveWithMultipleStreams" depends="setup">
     <bunzip2  src="bzip2/multiple.bz2" dest="${output}"/>
     <au:assertFilesMatch expected="bzip2/expected"
                          actual="${output}/multiple"/>
   </target>
 
-</project>
\ No newline at end of file
+  <target name="testWithNonFileResourceToFile" depends="setup">
+    <bunzip2 dest="${output}/greeting.txt">
+      <url url="http://ant.apache.org/webtest/bunzip2/greeting.txt.bz2"/>
+    </bunzip2>
+    <get src="http://ant.apache.org/webtest/gunzip/greeting.txt"
+         dest="${output}/orig.greeting.txt"/>
+    <au:assertFilesMatch expected="${output}/orig.greeting.txt"
+                         actual="${output}/greeting.txt"/>
+  </target>
+
+  <target name="testWithNonFileResourceToDir" depends="setup">
+    <bunzip2 dest="${output}">
+      <url url="http://ant.apache.org/webtest/bunzip2/greeting.txt.bz2"/>
+    </bunzip2>
+    <get src="http://ant.apache.org/webtest/gunzip/greeting.txt"
+         dest="${output}/orig.greeting.txt"/>
+    <au:assertFilesMatch expected="${output}/orig.greeting.txt"
+                         actual="${output}/greeting.txt"/>
+  </target>
+</project>