You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2013/01/27 19:41:57 UTC
svn commit: r1439137 -
/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
Author: lukaszlenart
Date: Sun Jan 27 18:41:57 2013
New Revision: 1439137
URL: http://svn.apache.org/viewvc?rev=1439137&view=rev
Log:
WW-3664 extends Dispatcher to create directory tree defined as struts.multipart.saveDir
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java?rev=1439137&r1=1439136&r2=1439137&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java Sun Jan 27 18:41:57 2013
@@ -681,21 +681,20 @@ public class Dispatcher {
File multipartSaveDir = new File(saveDir);
if (!multipartSaveDir.exists()) {
- if (!multipartSaveDir.mkdir()) {
+ if (!multipartSaveDir.mkdirs()) {
String logMessage;
- try {
- logMessage = "Could not find create multipart save directory '"+multipartSaveDir.getCanonicalPath()+"'.";
- } catch (IOException e) {
- logMessage = "Could not find create multipart save directory '"+multipartSaveDir.toString()+"'.";
- }
- if(devMode) {
+ try {
+ logMessage = "Could not find create multipart save directory '" + multipartSaveDir.getCanonicalPath() + "'.";
+ } catch (IOException e) {
+ logMessage = "Could not find create multipart save directory '" + multipartSaveDir.toString() + "'.";
+ }
+ if (devMode) {
LOG.error(logMessage);
- }
- else {
+ } else {
if (LOG.isWarnEnabled()) {
LOG.warn(logMessage);
}
- }
+ }
}
}
}