Author: fhanik
Date: Fri Nov 20 16:57:31 2009
New Revision: 882640
URL: http://svn.apache.org/viewvc?rev=882640&view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=48252
Fix potential recursion
Modified:
tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java?rev=882640&r1=882639&r2=882640&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java Fri Nov 20
16:57:31 2009
@@ -258,6 +258,9 @@
* 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 + ")");
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=882640&r1=882639&r2=882640&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Fri Nov
20 16:57:31 2009
@@ -312,7 +312,7 @@
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);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
