Author: markt
Date: Thu Jun 24 13:10:41 2010
New Revision: 957539
URL: http://svn.apache.org/viewvc?rev=957539&view=rev
Log:
Fix the Eclipse warnings and as a result better handle directory creation
failures
Modified:
tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java?rev=957539&r1=957538&r2=957539&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
Thu Jun 24 13:10:41 2010
@@ -102,7 +102,7 @@ public class HostManagerServlet
/**
* The Context container associated with our web application.
*/
- protected Context context = null;
+ protected transient Context context = null;
/**
@@ -114,19 +114,19 @@ public class HostManagerServlet
/**
* The associated host.
*/
- protected Host installedHost = null;
+ protected transient Host installedHost = null;
/**
* The associated engine.
*/
- protected Engine engine = null;
+ protected transient Engine engine = null;
/**
* MBean server.
*/
- protected MBeanServer mBeanServer = null;
+ protected transient MBeanServer mBeanServer = null;
/**
@@ -139,7 +139,7 @@ public class HostManagerServlet
/**
* The Wrapper container associated with this servlet.
*/
- protected Wrapper wrapper = null;
+ protected transient Wrapper wrapper = null;
// ----------------------------------------------- ContainerServlet Methods
@@ -372,7 +372,12 @@ public class HostManagerServlet
appBaseFile = file;
}
if (!appBaseFile.exists()) {
- appBaseFile.mkdirs();
+ if (!appBaseFile.mkdirs()) {
+ writer.println(sm.getString(
+ "hostManagerServlet.appBaseCreateFail",
+ appBaseFile.toString(), name));
+ return;
+ }
}
// Create base for config files
@@ -380,6 +385,11 @@ public class HostManagerServlet
// Copy manager.xml if requested
if (manager) {
+ if (configBaseFile == null) {
+ writer.println(sm.getString(
+ "hostManagerServlet.configBaseCreateFail", name));
+ return;
+ }
InputStream is = null;
OutputStream os = null;
try {
@@ -657,7 +667,11 @@ public class HostManagerServlet
if (installedHost != null) {
configBase = new File(configBase, hostName);
}
- configBase.mkdirs();
+ if (!configBase.exists()) {
+ if (!configBase.mkdirs()) {
+ return null;
+ }
+ }
return configBase;
}
Modified:
tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties?rev=957539&r1=957538&r2=957539&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties
Thu Jun 24 13:10:41 2010
@@ -13,6 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+hostManagerServlet.appBaseCreateFail=FAIL - Failed to create appBase [{0}] for
host [{1}]
+hostManagerServlet.configBaseCreateFail=FAIL - Failed to identify configBase
for host [{0}]
hostManagerServlet.noCommand=FAIL - No command was specified
hostManagerServlet.postCommand=FAIL - Tried to use command {0} via a GET
request but POST is required
hostManagerServlet.unknownCommand=FAIL - Unknown command {0}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=957539&r1=957538&r2=957539&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Jun 24 13:10:41 2010
@@ -107,6 +107,10 @@
expiration features. Also switch the manager application to the generic
CSRF protection filter. (markt)
</fix>
+ <fix>
+ Better handle failure to create directories required for new hosts in
+ the Host Manager application. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
