tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r1169453 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
Date Sun, 11 Sep 2011 13:26:00 GMT
Author: rjung
Date: Sun Sep 11 13:25:59 2011
New Revision: 1169453

URL: http://svn.apache.org/viewvc?rev=1169453&view=rev
Log:
The cache only gets populated if the context is
not null.

Backport of r1169447 from trunk.

Modified:
    tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java   (contents,
props changed)

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=1169453&r1=1169452&r2=1169453&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 Sun Sep
11 13:25:59 2011
@@ -166,6 +166,11 @@ public class DefaultInstanceManager impl
      */
     protected void postConstruct(Object instance, final Class<?> clazz)
             throws IllegalAccessException, InvocationTargetException {
+        if (context == null) {
+            // No resource injection
+            return;
+        }
+
         Class<?> superClass = clazz.getSuperclass();
         if (superClass != Object.class) {
             postConstruct(instance, superClass);

Propchange: tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Sep 11 13:25:59 2011
@@ -0,0 +1 @@
+/tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java:1155369-1169451



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message