From: markt Date: Sat, 27 Sep 2008 18:32:56 +0000 (+0000) Subject: Remove unused code reported by Find Bugs / Eclipse. No functional change. X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=798ce2d6d50df0702fd6f87cb3fa4690978f4f6e;p=tomcat7.0 Remove unused code reported by Find Bugs / Eclipse. No functional change. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@699713 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/java/org/apache/catalina/connector/Request.java b/java/org/apache/catalina/connector/Request.java index f92511f7f..02a14fc3a 100644 --- a/java/org/apache/catalina/connector/Request.java +++ b/java/org/apache/catalina/connector/Request.java @@ -1475,7 +1475,7 @@ public class Request // Ensure that the specified encoding is valid byte buffer[] = new byte[1]; buffer[0] = (byte) 'a'; - String dummy = new String(buffer, enc); + new String(buffer, enc); // Save the validated encoding coyoteRequest.setCharacterEncoding(enc); diff --git a/java/org/apache/catalina/manager/ManagerServlet.java b/java/org/apache/catalina/manager/ManagerServlet.java index fd5ae35fd..948793228 100644 --- a/java/org/apache/catalina/manager/ManagerServlet.java +++ b/java/org/apache/catalina/manager/ManagerServlet.java @@ -692,8 +692,6 @@ public class ManagerServlet // Find the local WAR file File localWar = new File(deployedPath, getDocBase(path) + ".war"); - // Find the local context deployment file (if any) - File localXml = new File(configBase, getConfigFile(path) + ".xml"); // Check if app already exists, or undeploy it if updating Context context = (Context) host.findChild(path); @@ -1336,18 +1334,6 @@ public class ManagerServlet return; } - // Identify the appBase of the owning Host of this Context (if any) - String appBase = null; - File appBaseDir = null; - if (context.getParent() instanceof Host) { - appBase = ((Host) context.getParent()).getAppBase(); - appBaseDir = new File(appBase); - if (!appBaseDir.isAbsolute()) { - appBaseDir = new File(System.getProperty("catalina.base"), - appBase); - } - } - if (!isDeployed(path)) { writer.println(sm.getString("managerServlet.notDeployed", RequestUtil.filter(displayPath))); diff --git a/java/org/apache/jasper/compiler/Parser.java b/java/org/apache/jasper/compiler/Parser.java index b8598a17a..0f1a39470 100644 --- a/java/org/apache/jasper/compiler/Parser.java +++ b/java/org/apache/jasper/compiler/Parser.java @@ -624,8 +624,7 @@ class Parser implements TagConstants { */ private void parseAttributeDirective(Node parent) throws JasperException { Attributes attrs = parseAttributes(); - Node.AttributeDirective n = new Node.AttributeDirective(attrs, start, - parent); + new Node.AttributeDirective(attrs, start, parent); } /* @@ -634,8 +633,7 @@ class Parser implements TagConstants { */ private void parseVariableDirective(Node parent) throws JasperException { Attributes attrs = parseAttributes(); - Node.VariableDirective n = new Node.VariableDirective(attrs, start, - parent); + new Node.VariableDirective(attrs, start, parent); } /* diff --git a/java/org/apache/tomcat/bayeux/request/MetaConnectRequest.java b/java/org/apache/tomcat/bayeux/request/MetaConnectRequest.java index f052e736f..baa4e8ffc 100644 --- a/java/org/apache/tomcat/bayeux/request/MetaConnectRequest.java +++ b/java/org/apache/tomcat/bayeux/request/MetaConnectRequest.java @@ -82,7 +82,7 @@ public class MetaConnectRequest extends RequestBase implements BayeuxRequest { * event to be delivered to this client (Section 4.2.2 of spec). */ public int process(int prevops) throws BayeuxException { - prevops = super.process(prevops); + super.process(prevops); response = (HashMap)responseTemplate.clone(); ClientImpl client = (ClientImpl)getTomcatBayeux().getClient(clientId); boolean success = false; diff --git a/java/org/apache/tomcat/bayeux/request/MetaDisconnectRequest.java b/java/org/apache/tomcat/bayeux/request/MetaDisconnectRequest.java index d191660c2..be840e9e0 100644 --- a/java/org/apache/tomcat/bayeux/request/MetaDisconnectRequest.java +++ b/java/org/apache/tomcat/bayeux/request/MetaDisconnectRequest.java @@ -76,7 +76,7 @@ public class MetaDisconnectRequest extends RequestBase implements BayeuxRequest * Disconnect a client session. */ public int process(int prevops) throws BayeuxException { - prevops = super.process(prevops); + super.process(prevops); response = (HashMap)responseTemplate.clone(); ClientImpl client = (ClientImpl)getTomcatBayeux().getClient(clientId); HttpError error = validate(); diff --git a/java/org/apache/tomcat/bayeux/request/MetaHandshakeRequest.java b/java/org/apache/tomcat/bayeux/request/MetaHandshakeRequest.java index 2835d1252..bd38b9e46 100644 --- a/java/org/apache/tomcat/bayeux/request/MetaHandshakeRequest.java +++ b/java/org/apache/tomcat/bayeux/request/MetaHandshakeRequest.java @@ -84,7 +84,7 @@ public class MetaHandshakeRequest extends RequestBase implements BayeuxRequest { * the Bayuex specification. */ public int process(int prevops) throws BayeuxException { - prevops = super.process(prevops); + super.process(prevops); response = (HashMap)responseTemplate.clone(); ClientImpl client = null; HttpError error = validate(); diff --git a/java/org/apache/tomcat/bayeux/request/MetaSubscribeRequest.java b/java/org/apache/tomcat/bayeux/request/MetaSubscribeRequest.java index c16667a4e..31994f3bb 100644 --- a/java/org/apache/tomcat/bayeux/request/MetaSubscribeRequest.java +++ b/java/org/apache/tomcat/bayeux/request/MetaSubscribeRequest.java @@ -82,7 +82,7 @@ public class MetaSubscribeRequest extends RequestBase implements BayeuxRequest { * channels and inverse client to channel reference. */ public int process(int prevops) throws BayeuxException { - prevops = super.process(prevops); + super.process(prevops); response = (HashMap)this.responseTemplate.clone(); ClientImpl client = (ClientImpl)getTomcatBayeux().getClient(clientId); HttpError error = validate(); diff --git a/java/org/apache/tomcat/bayeux/request/MetaUnsubscribeRequest.java b/java/org/apache/tomcat/bayeux/request/MetaUnsubscribeRequest.java index 28969a08a..69a57cd01 100644 --- a/java/org/apache/tomcat/bayeux/request/MetaUnsubscribeRequest.java +++ b/java/org/apache/tomcat/bayeux/request/MetaUnsubscribeRequest.java @@ -82,7 +82,7 @@ public class MetaUnsubscribeRequest extends RequestBase implements BayeuxRequest * Bayeux spec, a pattern may be specified. Sever relationships. */ public int process(int prevops) throws BayeuxException { - prevops = super.process(prevops); + super.process(prevops); response = (HashMap)responseTemplate.clone(); ClientImpl client = (ClientImpl)getTomcatBayeux().getClient(clientId); HttpError error = validate(); diff --git a/java/org/apache/tomcat/bayeux/request/PublishRequest.java b/java/org/apache/tomcat/bayeux/request/PublishRequest.java index 8bb0dff7e..fcf956ce7 100644 --- a/java/org/apache/tomcat/bayeux/request/PublishRequest.java +++ b/java/org/apache/tomcat/bayeux/request/PublishRequest.java @@ -88,7 +88,7 @@ public class PublishRequest extends RequestBase implements BayeuxRequest { * Send the event message to all registered subscribers. */ public int process(int prevops) throws BayeuxException { - prevops = super.process(prevops); + super.process(prevops); response = (HashMap)responseTemplate.clone(); ClientImpl client = clientId!=null?(ClientImpl)getTomcatBayeux().getClient(clientId): (ClientImpl)event.getHttpServletRequest().getAttribute("client"); diff --git a/java/org/apache/tomcat/util/modeler/BaseModelMBean.java b/java/org/apache/tomcat/util/modeler/BaseModelMBean.java index 3924f1040..924964e17 100644 --- a/java/org/apache/tomcat/util/modeler/BaseModelMBean.java +++ b/java/org/apache/tomcat/util/modeler/BaseModelMBean.java @@ -285,7 +285,7 @@ public class BaseModelMBean implements DynamicMBean, MBeanRegistration, ModelMBe "Method name is null"); if( log.isDebugEnabled()) log.debug("Invoke " + name); - MethodKey mkey = new MethodKey(name, signature); + Method method= managedBean.getInvoke(name, params, signature, this, resource); // Invoke the selected method on the appropriate object