tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r996261 - in /tomcat/trunk/java/org/apache: coyote/http11/Http11Processor.java tomcat/util/net/AbstractEndpoint.java tomcat/util/net/JIoEndpoint.java
Date Sun, 12 Sep 2010 08:05:35 GMT
Author: markt
Date: Sun Sep 12 08:05:35 2010
New Revision: 996261

URL: http://svn.apache.org/viewvc?rev=996261&view=rev
Log:
Fix Eclipse warnings prior to working on bz49884 refactoring

Modified:
    tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
    tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
    tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=996261&r1=996260&r2=996261&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Sun Sep 12 08:05:35 2010
@@ -325,7 +325,7 @@ public class Http11Processor extends Abs
     }
     
     
-    public SocketState asyncDispatch(SocketStatus status) throws IOException {
+    public SocketState asyncDispatch(SocketStatus status) {
 
         RequestInfo rp = request.getRequestProcessor();
         try {
@@ -405,6 +405,7 @@ public class Http11Processor extends Abs
      * @param actionCode Type of the action
      * @param param Action parameter
      */
+    @Override
     public void action(ActionCode actionCode, Object param) {
 
         if (actionCode == ActionCode.ACTION_COMMIT) {

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=996261&r1=996260&r2=996261&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Sun Sep 12 08:05:35
2010
@@ -462,15 +462,16 @@ public abstract class AbstractEndpoint {
     public abstract void destroy() throws Exception;
     
     public String adjustRelativePath(String path, String relativeTo) {
-        File f = new File(path);
+        String newPath = path;
+        File f = new File(newPath);
         if ( !f.isAbsolute()) {
-            path = relativeTo + File.separator + path;
-            f = new File(path);
+            newPath = relativeTo + File.separator + newPath;
+            f = new File(newPath);
         }
         if (!f.exists()) {
-            getLog().warn("configured file:["+path+"] does not exist.");
+            getLog().warn("configured file:["+newPath+"] does not exist.");
         }
-        return path;
+        return newPath;
     }
     
     public String defaultIfNull(String val, String defaultValue) {

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java?rev=996261&r1=996260&r2=996261&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java Sun Sep 12 08:05:35 2010
@@ -239,6 +239,7 @@ public class JIoEndpoint extends Abstrac
             this.status = status;
         }
 
+        @Override
         public void run() {
             boolean launch = false;
             try {
@@ -551,6 +552,7 @@ public class JIoEndpoint extends Abstrac
             this.cl = cl;
         }
 
+        @Override
         public Void run() {
             Thread.currentThread().setContextClassLoader(cl);
             return null;



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


Mime
View raw message