You are viewing a plain text version of this content. The canonical link for it is here.
Posted to rampart-dev@ws.apache.org by ru...@apache.org on 2007/07/11 13:17:29 UTC
svn commit: r555246 - in
/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy:
builders/IssuedTokenBuilder.java model/SupportingToken.java
Author: ruchithf
Date: Wed Jul 11 04:17:28 2007
New Revision: 555246
URL: http://svn.apache.org/viewvc?view=rev&rev=555246
Log:
Fixed a policy serialization NPE
Getting the policy within an IssuedToken properly
Modified:
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/IssuedTokenBuilder.java
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SupportingToken.java
Modified: webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/IssuedTokenBuilder.java
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/IssuedTokenBuilder.java?view=diff&rev=555246&r1=555245&r2=555246
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/IssuedTokenBuilder.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/IssuedTokenBuilder.java Wed Jul 11 04:17:28 2007
@@ -52,11 +52,9 @@
issuedToken.setRstTemplate(rstTmplElem);
}
- OMElement policyElement = element.getFirstElement();
+ OMElement policyElement = element.getFirstChildWithName(org.apache.neethi.Constants.Q_ELEM_POLICY);
- if (policyElement != null
- && policyElement.getQName().equals(
- org.apache.neethi.Constants.Q_ELEM_POLICY)) {
+ if (policyElement != null) {
Policy policy = PolicyEngine.getPolicy(policyElement);
policy = (Policy) policy.normalize(false);
Modified: webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SupportingToken.java
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SupportingToken.java?view=diff&rev=555246&r1=555245&r2=555246
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SupportingToken.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SupportingToken.java Wed Jul 11 04:17:28 2007
@@ -245,7 +245,7 @@
if (signedParts != null) {
- signedElements.serialize(writer);
+ signedParts.serialize(writer);
} else if (signedElements != null) {
signedElements.serialize(writer);