Author: markt
Date: Fri Jun 26 07:19:18 2015
New Revision: 1687683
URL: http://svn.apache.org/r1687683
Log:
Add engine name to virtual server name
Patch by fjodorver
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1687683&r1=1687682&r2=1687683&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Fri Jun
26 07:19:18 2015
@@ -1458,7 +1458,9 @@ public class ApplicationContext
@Override
public String getVirtualServerName() {
// Constructor will fail if context or its parent is null
- return ((Host) context.getParent()).getName();
+ Host host = (Host) context.getParent();
+ Engine engine = (Engine) host.getParent();
+ return engine.getName() + "/" + host.getName();
}
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=1687683&r1=1687682&r2=1687683&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Fri Jun 26
07:19:18 2015
@@ -459,7 +459,6 @@ public class ContextConfig implements Li
}
private String getJaspicAppContext() {
- // TODO: This might not be unique
return context.getServletContext().getVirtualServerName() + " " +
context.getPath();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
