From 8ac042ba40775a172ef98137619dd9371db32c3d Mon Sep 17 00:00:00 2001 From: fhanik Date: Fri, 20 Nov 2009 16:57:31 +0000 Subject: [PATCH] https://issues.apache.org/bugzilla/show_bug.cgi?id=48252 Fix potential recursion git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@882640 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/tomcat/util/IntrospectionUtils.java | 3 +++ java/org/apache/tomcat/util/net/AbstractEndpoint.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/java/org/apache/tomcat/util/IntrospectionUtils.java b/java/org/apache/tomcat/util/IntrospectionUtils.java index 9d750a61f..9317cf80e 100644 --- a/java/org/apache/tomcat/util/IntrospectionUtils.java +++ b/java/org/apache/tomcat/util/IntrospectionUtils.java @@ -258,6 +258,9 @@ public final class IntrospectionUtils { * you can have setDebug(1). */ public static boolean setProperty(Object o, String name, String value) { + return setProperty(o,name,value,true); + } + public static boolean setProperty(Object o, String name, String value,boolean invokeSetProperty) { if (log.isDebugEnabled()) log.debug("IntrospectionUtils: setProperty(" + o.getClass() + " " + name + "=" + value + ")"); diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java b/java/org/apache/tomcat/util/net/AbstractEndpoint.java index 8afcb806a..89e084346 100644 --- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java +++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java @@ -312,7 +312,7 @@ public abstract class AbstractEndpoint { if (name.startsWith(socketName)) { return IntrospectionUtils.setProperty(socketProperties, name.substring(socketName.length()), value); } else { - return IntrospectionUtils.setProperty(this,name,value); + return IntrospectionUtils.setProperty(this,name,value,false); } }catch ( Exception x ) { log.error("Unable to set attribute \""+name+"\" to \""+value+"\"",x); -- 2.11.0