Author: coheigea Date: Fri Jan 3 11:44:34 2014 New Revision: 1555055 URL: http://svn.apache.org/r1555055 Log: Merged revisions 1555053 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........ r1555053 | coheigea | 2014-01-03 11:30:10 +0000 (Fri, 03 Jan 2014) | 10 lines Merged revisions 1555051 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1555051 | coheigea | 2014-01-03 11:23:58 +0000 (Fri, 03 Jan 2014) | 2 lines [CXF-5480] - Element Id not unique in AbstractBindingBuilder ........ ........ Modified: cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java Modified: cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java?rev=1555055&r1=1555054&r2=1555055&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java (original) +++ cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java Fri Jan 3 11:44:34 2014 @@ -1036,7 +1036,7 @@ public abstract class AbstractBindingBui id = idAttr.getValue(); } else { //Add an id - id = "Id-" + elem.hashCode(); + id = wssConfig.getIdAllocator().createId("_", elem); String pfx = null; try { pfx = elem.lookupPrefix(PolicyConstants.WSU_NAMESPACE_URI);
