Author: coheigea
Date: Thu Feb 17 15:37:59 2011
New Revision: 1071648
URL: http://svn.apache.org/viewvc?rev=1071648&view=rev
Log:
Minor update to last commit for correctness.
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java?rev=1071648&r1=1071647&r2=1071648&view=diff
==============================================================================
---
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java
(original)
+++
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java
Thu Feb 17 15:37:59 2011
@@ -1012,9 +1012,11 @@ public class STSClient implements Config
String id = null;
if (rst != null) {
QName elName = DOMUtils.getElementQName(rst);
- if (elName.equals(new QName(WSConstants.SAML_NS, "Assertion"))) {
+ if (elName.equals(new QName(WSConstants.SAML_NS, "Assertion"))
+ && rst.hasAttributeNS(null, "AssertionID")) {
id = rst.getAttributeNS(null, "AssertionID");
- } else if (elName.equals(new QName(WSConstants.SAML2_NS,
"Assertion"))) {
+ } else if (elName.equals(new QName(WSConstants.SAML2_NS,
"Assertion"))
+ && rst.hasAttributeNS(null, "ID")) {
id = rst.getAttributeNS(null, "ID");
}
if (id == null) {
