You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2013/03/12 12:43:20 UTC
svn commit: r1455499 - in
/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders:
Trust10Builder.java Trust13Builder.java
Author: coheigea
Date: Tue Mar 12 11:43:19 2013
New Revision: 1455499
URL: http://svn.apache.org/r1455499
Log:
Minor policy thing
Modified:
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/Trust10Builder.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/Trust13Builder.java
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/Trust10Builder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/Trust10Builder.java?rev=1455499&r1=1455498&r2=1455499&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/Trust10Builder.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/Trust10Builder.java Tue Mar 12 11:43:19 2013
@@ -37,7 +37,10 @@ public class Trust10Builder implements A
final SPConstants.SPVersion spVersion = SPConstants.SPVersion.getSPVersion(element.getNamespaceURI());
final Element nestedPolicyElement = SPUtils.getFirstPolicyChildElement(element);
- final Policy nestedPolicy = nestedPolicyElement != null ? factory.getPolicyEngine().getPolicy(nestedPolicyElement) : new Policy();
+ if (nestedPolicyElement == null) {
+ throw new IllegalArgumentException("sp:Trust10 must have an inner wsp:Policy element");
+ }
+ final Policy nestedPolicy = factory.getPolicyEngine().getPolicy(nestedPolicyElement);
Trust10 trust10 = new Trust10(
spVersion,
nestedPolicy
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/Trust13Builder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/Trust13Builder.java?rev=1455499&r1=1455498&r2=1455499&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/Trust13Builder.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/Trust13Builder.java Tue Mar 12 11:43:19 2013
@@ -36,7 +36,10 @@ public class Trust13Builder extends Trus
final SPConstants.SPVersion spVersion = SPConstants.SPVersion.getSPVersion(element.getNamespaceURI());
final Element nestedPolicyElement = SPUtils.getFirstPolicyChildElement(element);
- final Policy nestedPolicy = nestedPolicyElement != null ? factory.getPolicyEngine().getPolicy(nestedPolicyElement) : new Policy();
+ if (nestedPolicyElement == null) {
+ throw new IllegalArgumentException("sp:Trust13 must have an inner wsp:Policy element");
+ }
+ final Policy nestedPolicy = factory.getPolicyEngine().getPolicy(nestedPolicyElement);
Trust13 trust13 = new Trust13(
spVersion,
nestedPolicy