Author: markt
Date: Fri Sep 5 14:04:31 2014
New Revision: 1622702
URL: http://svn.apache.org/r1622702
Log:
Follow-up to 1622312
Restore the original logic while still avoiding the resource leak
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/FragmentJarScannerCallback.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/FragmentJarScannerCallback.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/FragmentJarScannerCallback.java?rev=1622702&r1=1622701&r2=1622702&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/FragmentJarScannerCallback.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/FragmentJarScannerCallback.java
Fri Sep 5 14:04:31 2014
@@ -116,13 +116,15 @@ public class FragmentJarScannerCallback
fragment.setDelegate(delegate);
File fragmentFile = new File(file, FRAGMENT_LOCATION);
- try (InputStream stream = new FileInputStream(fragmentFile)) {
+ try {
if (fragmentFile.isFile()) {
- InputSource source =
- new InputSource(fragmentFile.toURI().toURL().toString());
- source.setByteStream(stream);
- if (!webXmlParser.parseWebXml(source, fragment, true)) {
- ok = false;
+ try (InputStream stream = new FileInputStream(fragmentFile)) {
+ InputSource source =
+ new
InputSource(fragmentFile.toURI().toURL().toString());
+ source.setByteStream(stream);
+ if (!webXmlParser.parseWebXml(source, fragment, true)) {
+ ok = false;
+ }
}
} else {
// If there is no web.xml, normal folder no impact on
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
