Author: remm
Date: Fri Nov 30 10:17:54 2018
New Revision: 1847795
URL: http://svn.apache.org/viewvc?rev=1847795&view=rev
Log:
Code cleanup, no change.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java
Modified:
tomcat/trunk/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java?rev=1847795&r1=1847794&r2=1847795&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java
Fri Nov 30 10:17:54 2018
@@ -20,6 +20,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
@@ -55,12 +56,13 @@ public class CatalinaBaseConfigurationSo
ioe = e;
}
if (result == null) {
- InputStream inputStream =
getClass().getClassLoader().getResourceAsStream("server-embed.xml");
- if (inputStream != null) {
+ // Compatibility with legacy server-embed.xml location
+ InputStream stream =
getClass().getClassLoader().getResourceAsStream("server-embed.xml");
+ if (stream != null) {
try {
- result = new Resource(inputStream,
getClass().getClassLoader().getResource("server-embed.xml").toURI());
+ result = new Resource(stream,
getClass().getClassLoader().getResource("server-embed.xml").toURI());
} catch (URISyntaxException e) {
- // Ignore
+ stream.close();
}
}
}
@@ -87,12 +89,13 @@ public class CatalinaBaseConfigurationSo
// Try classloader
InputStream stream =
getClass().getClassLoader().getResourceAsStream(name);
- try {
- if (stream != null) {
+ if (stream != null) {
+ try {
return new Resource(stream,
getClass().getClassLoader().getResource(name).toURI());
+ } catch (URISyntaxException e) {
+ stream.close();
+ throw new
IOException(sm.getString("catalinaConfigurationSource.cannotObtainURL", name),
e);
}
- } catch (URISyntaxException e) {
- throw new
IOException(sm.getString("catalinaConfigurationSource.cannotObtainURL", name),
e);
}
// Then try URI.
@@ -102,7 +105,7 @@ public class CatalinaBaseConfigurationSo
try {
URL url = uri.toURL();
return new Resource(url.openConnection().getInputStream(), uri);
- } catch (IllegalArgumentException e) {
+ } catch (MalformedURLException e) {
throw new
IOException(sm.getString("catalinaConfigurationSource.cannotObtainURL", name),
e);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
