You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2014/11/12 16:58:48 UTC
[2/3] cxf git commit: [CXF-6062] Fix adding interceptors to bus via
spring
[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/c4379960
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c4379960
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c4379960
Branch: refs/heads/3.0.x-fixes
Commit: c43799609c4d18c6ff852cf5174d80e1aa6dc694
Parents: 6552a56
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Nov 12 07:07:55 2014 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Nov 12 09:40:05 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/c4379960/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 {