Author: kkolinko
Date: Sat Nov 22 02:01:17 2014
New Revision: 1641026
URL: http://svn.apache.org/r1641026
Log:
Rename method, because it creates Jar object that has to be close()'d and is
not a simple getter.
(As I commented in Re: r1640978)
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
tomcat/trunk/java/org/apache/jasper/compiler/TldCache.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldResourcePath.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java?rev=1641026&r1=1641025&r2=1641026&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java Sat Nov
22 02:01:17 2014
@@ -520,7 +520,7 @@ class TagFileProcessor {
if (tagFilePath.startsWith("/META-INF/")) {
try {
tagJar = compiler.getCompilationContext().getTldResourcePath(
- tagInfo.getTagLibrary().getURI()).getJar();
+ tagInfo.getTagLibrary().getURI()).openJar();
} catch (IOException ioe) {
throw new JasperException(ioe);
}
@@ -634,7 +634,7 @@ class TagFileProcessor {
Jar jar = null;
try
{
- jar = tldResourcePath.getJar();
+ jar = tldResourcePath.openJar();
if (jar != null) {
// Add TLD
Modified: tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java?rev=1641026&r1=1641025&r2=1641026&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java Sat
Nov 22 02:01:17 2014
@@ -126,7 +126,7 @@ class TagLibraryInfoImpl extends TagLibr
Jar jar = null;
try {
- jar = tldResourcePath.getJar();
+ jar = tldResourcePath.openJar();
// Add the dependencies on the TLD to the referencing page
PageInfo pageInfo = ctxt.createCompiler().getPageInfo();
Modified: tomcat/trunk/java/org/apache/jasper/compiler/TldCache.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TldCache.java?rev=1641026&r1=1641025&r2=1641026&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/TldCache.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TldCache.java Sat Nov 22
02:01:17 2014
@@ -135,7 +135,7 @@ public class TldCache {
conn.getInputStream().close();
}
}
- try (Jar jar = tldResourcePath.getJar()) {
+ try (Jar jar = tldResourcePath.openJar()) {
if (jar != null) {
result[1] =
jar.getLastModified(tldResourcePath.getEntryName());
}
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldResourcePath.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldResourcePath.java?rev=1641026&r1=1641025&r2=1641026&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldResourcePath.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldResourcePath.java
Sat Nov 22 02:01:17 2014
@@ -127,7 +127,7 @@ public class TldResourcePath {
}
}
- public Jar getJar() throws IOException {
+ public Jar openJar() throws IOException {
if (entryName == null) {
return null;
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
