From 32c80866dd97dd1d30b1e83635d7a8f8edaef0eb Mon Sep 17 00:00:00 2001 From: markt Date: Thu, 2 Dec 2010 17:25:45 +0000 Subject: [PATCH] Remove unnecessary code Identified by FindBugs git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1041475 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/coyote/ajp/AbstractAjpProtocol.java | 7 +------ java/org/apache/coyote/http11/AbstractHttp11Protocol.java | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java index d1b1a9d41..de5238062 100644 --- 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 01d361e84..159cd76cb 100644 --- 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); } /** -- 2.11.0