Author: markt
Date: Mon Feb 23 14:56:19 2009
New Revision: 747040
URL: http://svn.apache.org/viewvc?rev=747040&view=rev
Log:
Fix various Eclipse warnings.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=747040&r1=747039&r2=747040&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Mon Feb 23
14:56:19 2009
@@ -345,7 +345,7 @@
synchronized (webDigester) {
try {
if (altDDName != null) {
- url = new File(altDDName).toURL();
+ url = new File(altDDName).toURI().toURL();
} else {
url = servletContext.getResource(
Constants.ApplicationWebXml);
@@ -384,9 +384,7 @@
webDigester.reset();
parseException = null;
try {
- if (stream != null) {
- stream.close();
- }
+ stream.close();
} catch (IOException e) {
log.error(sm.getString("contextConfig.applicationClose"),
e);
}
@@ -923,8 +921,7 @@
}
- protected void antiLocking()
- throws IOException {
+ protected void antiLocking() {
if ((context instanceof StandardContext)
&& ((StandardContext) context).getAntiResourceLocking()) {
@@ -1023,12 +1020,8 @@
*/
protected synchronized void beforeStart() {
- try {
- antiLocking();
- } catch (IOException e) {
- log.error(sm.getString("contextConfig.antiLocking"), e);
- }
-
+ antiLocking();
+
}
@@ -1335,9 +1328,8 @@
new File(System.getProperty("catalina.base"), "conf");
if (!configBase.exists()) {
return null;
- } else {
- return configBase;
}
+ return configBase;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
