svn commit: r1167152 - in /cxf/branches/2.4.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java

[dkulp]

Author: dkulp
Date: Fri Sep  9 13:24:55 2011
New Revision: 1167152

URL: http://svn.apache.org/viewvc?rev=1167152&view=rev
Log:
Merged revisions 1167126 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1167126 | dkulp | 2011-09-09 08:23:45 -0400 (Fri, 09 Sep 2011) | 1 line
  
  Fix issue of using <cxf:bus name=""> causing problems in spring
........

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

Propchange: cxf/branches/2.4.x-fixes/
            ('svn:mergeinfo' removed)

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

Modified: 
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java?rev=1167152&r1=1167151&r2=1167152&view=diff
==============================================================================
--- 
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
 (original)
+++ 
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
 Fri Sep  9 13:24:55 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);