From 562c27936519fa3bb1636c91f874de5808d5b290 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Thu, 2 Jan 2014 16:06:20 +0000
Subject: [PATCH] don't set the use-caches flag for all connections, just for
 the one currently read from - caught by Jesse Glick

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1554840 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/org/apache/tools/ant/ArgumentProcessorRegistry.java | 2 +-
 src/main/org/apache/tools/ant/ProjectHelperRepository.java   | 2 +-
 src/main/org/apache/tools/ant/helper/ProjectHelper2.java     | 2 +-
 src/main/org/apache/tools/ant/taskdefs/Antlib.java           | 2 +-
 src/main/org/apache/tools/ant/types/XMLCatalog.java          | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/org/apache/tools/ant/ArgumentProcessorRegistry.java b/src/main/org/apache/tools/ant/ArgumentProcessorRegistry.java
index f889d501b..e65854307 100644
--- a/src/main/org/apache/tools/ant/ArgumentProcessorRegistry.java
+++ b/src/main/org/apache/tools/ant/ArgumentProcessorRegistry.java
@@ -76,7 +76,7 @@ public class ArgumentProcessorRegistry {
                 while (resources.hasMoreElements()) {
                     URL resource = resources.nextElement();
                     URLConnection conn = resource.openConnection();
-                    conn.setDefaultUseCaches(false);
+                    conn.setUseCaches(false);
                     ArgumentProcessor processor = getProcessorByService(conn.getInputStream());
                     registerArgumentProcessor(processor);
                 }
diff --git a/src/main/org/apache/tools/ant/ProjectHelperRepository.java b/src/main/org/apache/tools/ant/ProjectHelperRepository.java
index 75c2476ff..1dd44124f 100644
--- a/src/main/org/apache/tools/ant/ProjectHelperRepository.java
+++ b/src/main/org/apache/tools/ant/ProjectHelperRepository.java
@@ -89,7 +89,7 @@ public class ProjectHelperRepository {
                 while (resources.hasMoreElements()) {
                     URL resource = resources.nextElement();
                     URLConnection conn = resource.openConnection();
-                    conn.setDefaultUseCaches(false);
+                    conn.setUseCaches(false);
                     projectHelper =
                         getProjectHelperByService(conn.getInputStream());
                     registerProjectHelper(projectHelper);
diff --git a/src/main/org/apache/tools/ant/helper/ProjectHelper2.java b/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
index fa48f03a2..0c1f883cf 100644
--- a/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
+++ b/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
@@ -259,7 +259,7 @@ public class ProjectHelper2 extends ProjectHelper {
                         zf.getInputStream(zf.getEntry(uri.substring(pling + 1)));
                 } else {
                     URLConnection conn = url.openConnection();
-                    conn.setDefaultUseCaches(false);
+                    conn.setUseCaches(false);
                     inputStream = conn.getInputStream();
                 }
             }
diff --git a/src/main/org/apache/tools/ant/taskdefs/Antlib.java b/src/main/org/apache/tools/ant/taskdefs/Antlib.java
index 44aaab272..8ff836a31 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Antlib.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Antlib.java
@@ -65,7 +65,7 @@ public class Antlib extends Task implements TaskContainer {
         // Check if we can contact the URL
         try {
             URLConnection conn = antlibUrl.openConnection();
-            conn.setDefaultUseCaches(false);
+            conn.setUseCaches(false);
             conn.connect();
         } catch (IOException ex) {
             throw new BuildException(
diff --git a/src/main/org/apache/tools/ant/types/XMLCatalog.java b/src/main/org/apache/tools/ant/types/XMLCatalog.java
index e93f6416e..09539ffb4 100644
--- a/src/main/org/apache/tools/ant/types/XMLCatalog.java
+++ b/src/main/org/apache/tools/ant/types/XMLCatalog.java
@@ -767,7 +767,7 @@ public class XMLCatalog extends DataType
                 InputStream is = null;
                 URLConnection conn = url.openConnection();
                 if (conn != null) {
-                    conn.setDefaultUseCaches(false);
+                    conn.setUseCaches(false);
                     is = conn.getInputStream();
                 }
                 if (is != null) {