Author: kkolinko
Date: Mon Feb 3 22:09:53 2014
New Revision: 1564099
URL: http://svn.apache.org/r1564099
Log:
Simplify. File.isDirectory() already checks for existence.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Catalina.java?rev=1564099&r1=1564098&r2=1564099&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Mon Feb 3
22:09:53 2014
@@ -762,8 +762,7 @@ public class Catalina {
protected void initDirs() {
String temp = System.getProperty("java.io.tmpdir");
- if (temp == null || (!(new File(temp)).exists())
- || (!(new File(temp)).isDirectory())) {
+ if (temp == null || (!(new File(temp)).isDirectory())) {
log.error(sm.getString("embedded.notmp", temp));
}
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1564099&r1=1564098&r2=1564099&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Feb 3 22:09:53 2014
@@ -60,6 +60,9 @@
Fix WebDAV support that was broken by the refactoring for the new
resources implementation. (markt)
</fix>
+ <scode>
+ Simplify Catalina.initDirs(). (kkolinko)
+ </scode>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
