Author: markt
Date: Tue May 29 13:38:05 2012
New Revision: 1343721
URL: http://svn.apache.org/viewvc?rev=1343721&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53180
Add additional checks when looking for a setter method.
Patch provided by Violeta Georgieva.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1343718
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=1343721&r1=1343720&r2=1343721&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
Tue May 29 13:38:05 2012
@@ -356,7 +356,10 @@ public class DefaultInstanceManager impl
String methodName = method.getName();
if (context != null) {
// Resource injection only if JNDI is enabled
- if (injections != null && methodName.startsWith("set")
&& methodName.length() > 3) {
+ if (injections != null && methodName.startsWith("set")
+ && methodName.length() > 3
+ && method.getParameterTypes().length ==
1
+ &&
method.getReturnType().getName().equals("void")) {
String fieldName =
Character.toLowerCase(methodName.charAt(3)) + methodName.substring(4);
if (injections.containsKey(fieldName)) {
annotations.add(new AnnotationCacheEntry(
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1343721&r1=1343720&r2=1343721&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue May 29 13:38:05 2012
@@ -175,6 +175,10 @@
via getter from the endpoint and as JMX attribute of the ThreadPool
mbean. (rjung)
</add>
+ <fix>
+ <bug>53180</bug>: Improve check for setter method when processing
+ annotations. Patch provided by Violeta Georgieva. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Cluster">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
