Author: bodewig
Date: Thu Jan 2 16:06:20 2014
New Revision: 1554840
URL: http://svn.apache.org/r1554840
Log:
don't set the use-caches flag for all connections, just for the one currently
read from - caught by Jesse Glick
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/ArgumentProcessorRegistry.java
ant/core/trunk/src/main/org/apache/tools/ant/ProjectHelperRepository.java
ant/core/trunk/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Antlib.java
ant/core/trunk/src/main/org/apache/tools/ant/types/XMLCatalog.java
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/ArgumentProcessorRegistry.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/ArgumentProcessorRegistry.java?rev=1554840&r1=1554839&r2=1554840&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/ArgumentProcessorRegistry.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/ArgumentProcessorRegistry.java
Thu Jan 2 16:06:20 2014
@@ -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);
}
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/ProjectHelperRepository.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/ProjectHelperRepository.java?rev=1554840&r1=1554839&r2=1554840&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/ProjectHelperRepository.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/ProjectHelperRepository.java
Thu Jan 2 16:06:20 2014
@@ -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);
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/helper/ProjectHelper2.java?rev=1554840&r1=1554839&r2=1554840&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/helper/ProjectHelper2.java Thu
Jan 2 16:06:20 2014
@@ -259,7 +259,7 @@ public class ProjectHelper2 extends Proj
zf.getInputStream(zf.getEntry(uri.substring(pling +
1)));
} else {
URLConnection conn = url.openConnection();
- conn.setDefaultUseCaches(false);
+ conn.setUseCaches(false);
inputStream = conn.getInputStream();
}
}
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Antlib.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Antlib.java?rev=1554840&r1=1554839&r2=1554840&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Antlib.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Antlib.java Thu Jan
2 16:06:20 2014
@@ -65,7 +65,7 @@ public class Antlib extends Task impleme
// 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(
Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/XMLCatalog.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/XMLCatalog.java?rev=1554840&r1=1554839&r2=1554840&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/types/XMLCatalog.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/types/XMLCatalog.java Thu Jan
2 16:06:20 2014
@@ -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) {
