Author: kkolinko
Date: Wed May 30 00:51:22 2012
New Revision: 1344066
URL: http://svn.apache.org/viewvc?rev=1344066&view=rev
Log:
Merged revision 1344063 from tomcat/trunk:
(Followup to r1343721) tabs -> spaces.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1344063
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=1344066&r1=1344065&r2=1344066&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
Wed May 30 00:51:22 2012
@@ -358,8 +358,8 @@ public class DefaultInstanceManager impl
// Resource injection only if JNDI is enabled
if (injections != null && methodName.startsWith("set")
&& methodName.length() > 3
- && method.getParameterTypes().length ==
1
- &&
method.getReturnType().getName().equals("void")) {
+ && 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(
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
