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 f92511f..02a14fc 100644 (file)
--- 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 fd5ae35..9487932 100644 (file)
--- 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 b8598a1..0f1a394 100644 (file)
--- 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 f052e73..baa4e8f 100644 (file)
--- 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).\r
      */\r
     public int process(int prevops) throws BayeuxException {\r
-        prevops = super.process(prevops);\r
+        super.process(prevops);\r
         response = (HashMap<String, Object>)responseTemplate.clone();\r
         ClientImpl client = (ClientImpl)getTomcatBayeux().getClient(clientId);\r
         boolean success = false;\r

diff --git a/java/org/apache/tomcat/bayeux/request/MetaDisconnectRequest.java b/java/org/apache/tomcat/bayeux/request/MetaDisconnectRequest.java
index d191660..be840e9 100644 (file)
--- 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.\r
      */\r
     public int process(int prevops) throws BayeuxException {\r
-        prevops = super.process(prevops);\r
+        super.process(prevops);\r
         response = (HashMap<String, Object>)responseTemplate.clone();\r
         ClientImpl client = (ClientImpl)getTomcatBayeux().getClient(clientId);\r
         HttpError error = validate();\r

diff --git a/java/org/apache/tomcat/bayeux/request/MetaHandshakeRequest.java b/java/org/apache/tomcat/bayeux/request/MetaHandshakeRequest.java
index 2835d12..bd38b9e 100644 (file)
--- 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.\r
      */\r
     public int process(int prevops) throws BayeuxException {\r
-        prevops = super.process(prevops);\r
+        super.process(prevops);\r
         response = (HashMap<String, Object>)responseTemplate.clone();\r
         ClientImpl client = null;\r
         HttpError error = validate();\r

diff --git a/java/org/apache/tomcat/bayeux/request/MetaSubscribeRequest.java b/java/org/apache/tomcat/bayeux/request/MetaSubscribeRequest.java
index c16667a..31994f3 100644 (file)
--- 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.\r
      */\r
     public int process(int prevops) throws BayeuxException {\r
-        prevops = super.process(prevops);\r
+        super.process(prevops);\r
         response = (HashMap<String, Object>)this.responseTemplate.clone();\r
         ClientImpl client = (ClientImpl)getTomcatBayeux().getClient(clientId);\r
         HttpError error = validate();\r

diff --git a/java/org/apache/tomcat/bayeux/request/MetaUnsubscribeRequest.java b/java/org/apache/tomcat/bayeux/request/MetaUnsubscribeRequest.java
index 28969a0..69a57cd 100644 (file)
--- 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.\r
      */\r
     public int process(int prevops) throws BayeuxException {\r
-        prevops = super.process(prevops);\r
+        super.process(prevops);\r
         response = (HashMap<String, Object>)responseTemplate.clone();\r
         ClientImpl client = (ClientImpl)getTomcatBayeux().getClient(clientId);\r
         HttpError error = validate();\r

diff --git a/java/org/apache/tomcat/bayeux/request/PublishRequest.java b/java/org/apache/tomcat/bayeux/request/PublishRequest.java
index 8bb0dff..fcf956c 100644 (file)
--- 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.\r
      */\r
     public int process(int prevops) throws BayeuxException {\r
-        prevops = super.process(prevops);\r
+        super.process(prevops);\r
         response = (HashMap<String, Object>)responseTemplate.clone();\r
         ClientImpl client = clientId!=null?(ClientImpl)getTomcatBayeux().getClient(clientId):\r
                                            (ClientImpl)event.getHttpServletRequest().getAttribute("client");\r

diff --git a/java/org/apache/tomcat/util/modeler/BaseModelMBean.java b/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
index 3924f10..924964e 100644 (file)
--- 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