Author: dkulp Date: Fri Nov 16 17:14:19 2012 New Revision: 1410477 URL: http://svn.apache.org/viewvc?rev=1410477&view=rev Log: Merged revisions 1410414 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1410414 | dkulp | 2012-11-16 10:58:39 -0500 (Fri, 16 Nov 2012) | 11 lines Merged revisions 1410181 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1410181 | dkulp | 2012-11-15 22:11:25 -0500 (Thu, 15 Nov 2012) | 3 lines Make sure the generated busid doesn't have a - in it as some patterns don't account for it. ........ ........ Modified: cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/CXFBusImpl.java Modified: cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/CXFBusImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/CXFBusImpl.java?rev=1410477&r1=1410476&r2=1410477&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/CXFBusImpl.java (original) +++ cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/CXFBusImpl.java Fri Nov 16 17:14:19 2012 @@ -143,7 +143,7 @@ public class CXFBusImpl extends Abstract } public String getId() { - return null == id ? DEFAULT_BUS_ID + Integer.toString(this.hashCode()) : id; + return null == id ? DEFAULT_BUS_ID + Integer.toString(Math.abs(this.hashCode())) : id; } public void run() {
