tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r699713 - in /tomcat/trunk/java/org/apache: catalina/connector/ catalina/manager/ jasper/compiler/ tomcat/bayeux/request/ tomcat/util/modeler/
Date Sat, 27 Sep 2008 18:32:56 GMT
Author: markt
Date: Sat Sep 27 11:32:56 2008
New Revision: 699713

URL: http://svn.apache.org/viewvc?rev=699713&view=rev
Log:
Remove unused code reported by Find Bugs / Eclipse. No functional change.

Modified:
    tomcat/trunk/java/org/apache/catalina/connector/Request.java
    tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
    tomcat/trunk/java/org/apache/jasper/compiler/Parser.java
    tomcat/trunk/java/org/apache/tomcat/bayeux/request/MetaConnectRequest.java
    tomcat/trunk/java/org/apache/tomcat/bayeux/request/MetaDisconnectRequest.java
    tomcat/trunk/java/org/apache/tomcat/bayeux/request/MetaHandshakeRequest.java
    tomcat/trunk/java/org/apache/tomcat/bayeux/request/MetaSubscribeRequest.java
    tomcat/trunk/java/org/apache/tomcat/bayeux/request/MetaUnsubscribeRequest.java
    tomcat/trunk/java/org/apache/tomcat/bayeux/request/PublishRequest.java
    tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=699713&r1=699712&r2=699713&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Sat Sep 27 11:32:56 2008
@@ -1475,7 +1475,7 @@
         // 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);

Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=699713&r1=699712&r2=699713&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Sat Sep 27 11:32:56
2008
@@ -692,8 +692,6 @@
 
         // 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 @@
                 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)));

Modified: tomcat/trunk/java/org/apache/jasper/compiler/Parser.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Parser.java?rev=699713&r1=699712&r2=699713&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Parser.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Parser.java Sat Sep 27 11:32:56 2008
@@ -624,8 +624,7 @@
      */
     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 @@
      */
     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);
     }
 
     /*

Modified: tomcat/trunk/java/org/apache/tomcat/bayeux/request/MetaConnectRequest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/bayeux/request/MetaConnectRequest.java?rev=699713&r1=699712&r2=699713&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/bayeux/request/MetaConnectRequest.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/bayeux/request/MetaConnectRequest.java Sat Sep 27
11:32:56 2008
@@ -82,7 +82,7 @@
      * 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<String, Object>)responseTemplate.clone();
         ClientImpl client = (ClientImpl)getTomcatBayeux().getClient(clientId);
         boolean success = false;

Modified: tomcat/trunk/java/org/apache/tomcat/bayeux/request/MetaDisconnectRequest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/bayeux/request/MetaDisconnectRequest.java?rev=699713&r1=699712&r2=699713&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/bayeux/request/MetaDisconnectRequest.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/bayeux/request/MetaDisconnectRequest.java Sat Sep
27 11:32:56 2008
@@ -76,7 +76,7 @@
      * Disconnect a client session.
      */
     public int process(int prevops) throws BayeuxException {
-        prevops = super.process(prevops);
+        super.process(prevops);
         response = (HashMap<String, Object>)responseTemplate.clone();
         ClientImpl client = (ClientImpl)getTomcatBayeux().getClient(clientId);
         HttpError error = validate();

Modified: tomcat/trunk/java/org/apache/tomcat/bayeux/request/MetaHandshakeRequest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/bayeux/request/MetaHandshakeRequest.java?rev=699713&r1=699712&r2=699713&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/bayeux/request/MetaHandshakeRequest.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/bayeux/request/MetaHandshakeRequest.java Sat Sep 27
11:32:56 2008
@@ -84,7 +84,7 @@
      * the Bayuex specification.
      */
     public int process(int prevops) throws BayeuxException {
-        prevops = super.process(prevops);
+        super.process(prevops);
         response = (HashMap<String, Object>)responseTemplate.clone();
         ClientImpl client = null;
         HttpError error = validate();

Modified: tomcat/trunk/java/org/apache/tomcat/bayeux/request/MetaSubscribeRequest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/bayeux/request/MetaSubscribeRequest.java?rev=699713&r1=699712&r2=699713&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/bayeux/request/MetaSubscribeRequest.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/bayeux/request/MetaSubscribeRequest.java Sat Sep 27
11:32:56 2008
@@ -82,7 +82,7 @@
      * channels and inverse client to channel reference.
      */
     public int process(int prevops) throws BayeuxException {
-        prevops = super.process(prevops);
+        super.process(prevops);
         response = (HashMap<String, Object>)this.responseTemplate.clone();
         ClientImpl client = (ClientImpl)getTomcatBayeux().getClient(clientId);
         HttpError error = validate();

Modified: tomcat/trunk/java/org/apache/tomcat/bayeux/request/MetaUnsubscribeRequest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/bayeux/request/MetaUnsubscribeRequest.java?rev=699713&r1=699712&r2=699713&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/bayeux/request/MetaUnsubscribeRequest.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/bayeux/request/MetaUnsubscribeRequest.java Sat Sep
27 11:32:56 2008
@@ -82,7 +82,7 @@
      * 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<String, Object>)responseTemplate.clone();
         ClientImpl client = (ClientImpl)getTomcatBayeux().getClient(clientId);
         HttpError error = validate();

Modified: tomcat/trunk/java/org/apache/tomcat/bayeux/request/PublishRequest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/bayeux/request/PublishRequest.java?rev=699713&r1=699712&r2=699713&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/bayeux/request/PublishRequest.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/bayeux/request/PublishRequest.java Sat Sep 27 11:32:56
2008
@@ -88,7 +88,7 @@
      *  Send the event message to all registered subscribers.
      */
     public int process(int prevops) throws BayeuxException {
-        prevops = super.process(prevops);
+        super.process(prevops);
         response = (HashMap<String, Object>)responseTemplate.clone();
         ClientImpl client = clientId!=null?(ClientImpl)getTomcatBayeux().getClient(clientId):
                                            (ClientImpl)event.getHttpServletRequest().getAttribute("client");

Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java?rev=699713&r1=699712&r2=699713&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java Sat Sep 27 11:32:56
2008
@@ -285,7 +285,7 @@
                  "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



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message