You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/05/04 19:57:33 UTC
svn commit: r1334098 - in /cxf/branches/2.3.x-fixes: ./
rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java
Author: dkulp
Date: Fri May 4 17:57:33 2012
New Revision: 1334098
URL: http://svn.apache.org/viewvc?rev=1334098&view=rev
Log:
Merged revisions 1332691 via svn merge from
https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes
........
r1332691 | coheigea | 2012-05-01 11:08:48 -0400 (Tue, 01 May 2012) | 9 lines
Merged revisions 1332683 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........
r1332683 | coheigea | 2012-05-01 16:03:28 +0100 (Tue, 01 May 2012) | 2 lines
Only write wst:SecondaryParameters out if there are child Elements
........
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java?rev=1334098&r1=1334097&r2=1334098&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java (original)
+++ cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java Fri May 4 17:57:33 2012
@@ -454,7 +454,7 @@ public class STSClient implements Config
String keyTypeTemplate = null;
String sptt = null;
- if (template != null) {
+ if (template != null && DOMUtils.getFirstElement(template) != null) {
if (this.useSecondaryParameters()) {
writer.writeStartElement("wst", "SecondaryParameters", namespace);
}