Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C0DE610F71 for ; Fri, 3 Jan 2014 11:30:43 +0000 (UTC) Received: (qmail 6229 invoked by uid 500); 3 Jan 2014 11:30:39 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 6153 invoked by uid 500); 3 Jan 2014 11:30:37 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 6141 invoked by uid 99); 3 Jan 2014 11:30:34 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Jan 2014 11:30:34 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Jan 2014 11:30:31 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B13B92388860; Fri, 3 Jan 2014 11:30:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1555053 - /cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java Date: Fri, 03 Jan 2014 11:30:10 -0000 To: commits@cxf.apache.org From: coheigea@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140103113010.B13B92388860@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: coheigea Date: Fri Jan 3 11:30:10 2014 New Revision: 1555053 URL: http://svn.apache.org/r1555053 Log: 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.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java Modified: cxf/branches/2.7.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.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java?rev=1555053&r1=1555052&r2=1555053&view=diff ============================================================================== --- cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java (original) +++ cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java Fri Jan 3 11:30:10 2014 @@ -1057,7 +1057,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);