Author: kfujino
Date: Thu Mar 27 09:45:58 2014
New Revision: 1582235
URL: http://svn.apache.org/r1582235
Log:
Ensure that "name" request parameter is used as a application base of host if
"webapps" request parameter is not set when adding host in HostManager
Application.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java?rev=1582235&r1=1582234&r2=1582235&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
Thu Mar 27 09:45:58 2014
@@ -371,11 +371,11 @@ public class HostManagerServlet
// Validate and create appBase
File appBaseFile = null;
File file = null;
- if (appBase == null || appBase.length() == 0) {
- file = new File(name);
- } else {
- file = new File(appBase);
+ String applicationBase = appBase;
+ if (applicationBase == null || applicationBase.length() == 0) {
+ applicationBase = name;
}
+ file = new File(applicationBase);
if (!file.isAbsolute())
file = new File(System.getProperty(Globals.CATALINA_BASE_PROP),
file.getPath());
try {
@@ -436,7 +436,7 @@ public class HostManagerServlet
}
StandardHost host = new StandardHost();
- host.setAppBase(appBase);
+ host.setAppBase(applicationBase);
host.setName(name);
host.addLifecycleListener(new HostConfig());
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1582235&r1=1582234&r2=1582235&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Mar 27 09:45:58 2014
@@ -74,6 +74,11 @@
Add Support for <code>copyXML</code> attribute of Host to Host Manager.
(kfujino)
</fix>
+ <fix>
+ Ensure that "name" request parameter is used as a application base of
+ host if "webapps" request parameter is not set when adding host in
+ HostManager Application. (kfujino)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
