You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2006/11/10 22:07:00 UTC
svn commit: r473474 -
/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/loader/WebappLoader.java
Author: markt
Date: Fri Nov 10 13:06:59 2006
New Revision: 473474
URL: http://svn.apache.org/viewvc?view=rev&rev=473474
Log:
Clean up code. No functional change.
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/loader/WebappLoader.java
Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/loader/WebappLoader.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/loader/WebappLoader.java?view=diff&rev=473474&r1=473473&r2=473474
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/loader/WebappLoader.java (original)
+++ tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/loader/WebappLoader.java Fri Nov 10 13:06:59 2006
@@ -49,7 +49,6 @@
import org.apache.catalina.Container;
import org.apache.catalina.Context;
-import org.apache.catalina.Engine;
import org.apache.catalina.Globals;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleException;
@@ -594,7 +593,6 @@
// Register ourself. The container must be a webapp
try {
StandardContext ctx=(StandardContext)container;
- Engine eng=(Engine)ctx.getParent().getParent();
String path = ctx.getPath();
if (path.equals("")) {
path = "/";
@@ -690,7 +688,6 @@
((ClassLoader) classLoader, this.container.getResources());
StandardContext ctx=(StandardContext)container;
- Engine eng=(Engine)ctx.getParent().getParent();
String path = ctx.getPath();
if (path.equals("")) {
path = "/";
@@ -739,7 +736,6 @@
try {
StandardContext ctx=(StandardContext)container;
- Engine eng=(Engine)ctx.getParent().getParent();
String path = ctx.getPath();
if (path.equals("")) {
path = "/";
@@ -772,7 +768,6 @@
// Validate the source of this event
if (!(event.getSource() instanceof Context))
return;
- Context context = (Context) event.getSource();
// Process a relevant property change
if (event.getPropertyName().equals("reloadable")) {
@@ -1229,15 +1224,11 @@
org.apache.commons.logging.LogFactory.getLog( WebappLoader.class );
private ObjectName oname;
- private MBeanServer mserver;
- private String domain;
private ObjectName controller;
public ObjectName preRegister(MBeanServer server,
ObjectName name) throws Exception {
oname=name;
- mserver=server;
- domain=name.getDomain();
return name;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org