Author: dkulp
Date: Fri Sep 9 12:23:45 2011
New Revision: 1167126
URL: http://svn.apache.org/viewvc?rev=1167126&view=rev
Log:
Fix issue of using <cxf:bus name=""> causing problems in spring
Modified:
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
Modified:
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java?rev=1167126&r1=1167125&r2=1167126&view=diff
==============================================================================
---
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
(original)
+++
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
Fri Sep 9 12:23:45 2011
@@ -54,6 +54,10 @@ public class BusDefinitionParser extends
String bus = element.getAttribute("bus");
if (StringUtils.isEmpty(bus)) {
bus = element.getAttribute("name");
+ if (StringUtils.isEmpty(bus)) {
+ element.setAttribute("bus", bus);
+ element.removeAttribute("name");
+ }
}
if (StringUtils.isEmpty(bus)) {
addBusWiringAttribute(bean, BusWiringType.PROPERTY);