You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2013/11/19 15:24:14 UTC
svn commit: r1543438 -
/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractEncryptOutputProcessor.java
Author: coheigea
Date: Tue Nov 19 14:24:14 2013
New Revision: 1543438
URL: http://svn.apache.org/r1543438
Log:
Check to see whether an encryption part is required or not
Modified:
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractEncryptOutputProcessor.java
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractEncryptOutputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractEncryptOutputProcessor.java?rev=1543438&r1=1543437&r2=1543438&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractEncryptOutputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractEncryptOutputProcessor.java Tue Nov 19 14:24:14 2013
@@ -93,14 +93,16 @@ public abstract class AbstractEncryptOut
Map.Entry<Object, SecurePart> securePartEntry = securePartsMapIterator.next();
final SecurePart securePart = securePartEntry.getValue();
- for (int i = 0; encryptionPartDefs != null && i < encryptionPartDefs.size(); i++) {
- EncryptionPartDef encryptionPartDef = encryptionPartDefs.get(i);
-
- if (encryptionPartDef.getSecurePart() == securePart) {
- continue loop;
+ if (securePart.isRequired()) {
+ for (int i = 0; encryptionPartDefs != null && i < encryptionPartDefs.size(); i++) {
+ EncryptionPartDef encryptionPartDef = encryptionPartDefs.get(i);
+
+ if (encryptionPartDef.getSecurePart() == securePart) {
+ continue loop;
+ }
}
+ throw new XMLSecurityException("stax.encryption.securePartNotFound", securePart.getName());
}
- throw new XMLSecurityException("stax.encryption.securePartNotFound", securePart.getName());
}
}