Remove unnecessary code

Identified by FindBugs

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1041475 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
index d1b1a9d..de52380 100644 (file)
--- a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
+++ b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
@@ -83,12 +83,7 @@ public abstract class AbstractAjpProtocol implements ProtocolHandler, MBeanRegis
      */
     public boolean setProperty(String name, String value) {
         setAttribute(name, value); //store all settings
-        if ( name!=null && (name.startsWith("socket.") ||name.startsWith("selectorPool.")) ){
-            return endpoint.setProperty(name, value);
-        } else {
-            return endpoint.setProperty(name,value); //make sure we at least try to set all properties
-        }
-        
+        return endpoint.setProperty(name, value);
     }
 
     /**

diff --git a/java/org/apache/coyote/http11/AbstractHttp11Protocol.java b/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
index 01d361e..159cd76 100644 (file)
--- a/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
+++ b/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
@@ -91,12 +91,7 @@ public abstract class AbstractHttp11Protocol implements ProtocolHandler, MBeanRe
      */
     public boolean setProperty(String name, String value) {
         setAttribute(name, value); //store all settings
-        if ( name!=null && (name.startsWith("socket.") ||name.startsWith("selectorPool.")) ){
-            return endpoint.setProperty(name, value);
-        } else {
-            return endpoint.setProperty(name,value); //make sure we at least try to set all properties
-        }
-        
+        return endpoint.setProperty(name, value);
     }
 
     /**