cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject cxf git commit: [CXF-6062] Fix adding interceptors to bus via spring
Date Wed, 12 Nov 2014 13:14:56 GMT
Repository: cxf
Updated Branches:
  refs/heads/master e2ad037fb -> 36b72974e


[CXF-6062] Fix adding interceptors to bus via spring


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/36b72974
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/36b72974
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/36b72974

Branch: refs/heads/master
Commit: 36b72974e16fe04dd1d23c91e2f149de8f184386
Parents: e2ad037
Author: Daniel Kulp <dkulp@apache.org>
Authored: Wed Nov 12 07:07:55 2014 -0500
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Wed Nov 12 07:08:19 2014 -0500

----------------------------------------------------------------------
 .../apache/cxf/bus/spring/BusDefinitionParser.java  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/36b72974/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java b/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
index d3f200d..847ce28 100644
--- a/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
+++ b/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
@@ -168,30 +168,30 @@ public class BusDefinitionParser extends AbstractBeanDefinitionParser
{
             if (bus == bb) {
                 return;
             }
-            bus = bb;
             if (properties != null) {
-                bus.setProperties(properties);
+                bb.setProperties(properties);
                 properties = null;
             }
             if (!getInInterceptors().isEmpty()) {
-                bus.getInInterceptors().addAll(getInInterceptors());
+                bb.getInInterceptors().addAll(getInInterceptors());
             }
             if (!getOutInterceptors().isEmpty()) {
-                bus.getOutInterceptors().addAll(getOutInterceptors());
+                bb.getOutInterceptors().addAll(getOutInterceptors());
             }
             if (!getInFaultInterceptors().isEmpty()) {
-                bus.getInFaultInterceptors().addAll(getInFaultInterceptors());
+                bb.getInFaultInterceptors().addAll(getInFaultInterceptors());
             }
             if (!getOutFaultInterceptors().isEmpty()) {
-                bus.getOutFaultInterceptors().addAll(getOutFaultInterceptors());
+                bb.getOutFaultInterceptors().addAll(getOutFaultInterceptors());
             }
             if (!StringUtils.isEmpty(id)) {
-                bus.setId(id);
+                bb.setId(id);
             }
             if (features != null) {
-                bus.setFeatures(features);
+                bb.setFeatures(features);
                 features = null;
             }
+            bus = bb;
         }
 
         public void setApplicationContext(ApplicationContext applicationContext) throws BeansException
{


Mime
View raw message