cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r1468759 - in /cxf/branches/2.7.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java
Date Wed, 17 Apr 2013 06:09:41 GMT
Author: ningjiang
Date: Wed Apr 17 06:09:40 2013
New Revision: 1468759

URL: http://svn.apache.org/r1468759
Log:
Merged revisions 1468755 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1468755 | ningjiang | 2013-04-17 14:01:23 +0800 (Wed, 17 Apr 2013) | 1 line
  
  CXF-4870 CXF-4970 fixed find BundleContext issue inside the Spring Context
........

Modified:
    cxf/branches/2.7.x-fixes/   (props changed)
    cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1468755

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java?rev=1468759&r1=1468758&r2=1468759&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java
(original)
+++ cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java
Wed Apr 17 06:09:40 2013
@@ -102,7 +102,7 @@ public class SpringBeanLocator implement
         Object answer = null;
         ApplicationContext aContext = applicationContext;
         // try to find out the bundleContext by going through the parent context
-        while (aContext != null && answer != null) {
+        while (aContext != null && answer == null) {
             answer = getBundleContext(aContext, b);
             aContext = aContext.getParent();
         }



Mime
View raw message