You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by gi...@apache.org on 2013/04/22 19:56:17 UTC
svn commit: r1470640 - in
/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax:
ext/ComparableType.java
impl/processor/input/AbstractDecryptInputProcessor.java
Author: giger
Date: Mon Apr 22 17:56:17 2013
New Revision: 1470640
URL: http://svn.apache.org/r1470640
Log:
small fixes
Modified:
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/ComparableType.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/ComparableType.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/ComparableType.java?rev=1470640&r1=1470639&r2=1470640&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/ComparableType.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/ComparableType.java Mon Apr 22 17:56:17 2013
@@ -42,6 +42,9 @@ public abstract class ComparableType<T e
@Override
public boolean equals(Object obj) {
+ if (obj == null) {
+ return false;
+ }
if (this == obj) {
return true;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java?rev=1470640&r1=1470639&r2=1470640&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java Mon Apr 22 17:56:17 2013
@@ -374,10 +374,9 @@ public abstract class AbstractDecryptInp
private InboundSecurityToken getSecurityToken(InputProcessorChain inputProcessorChain,
XMLSecStartElement xmlSecStartElement,
EncryptedDataType encryptedDataType) throws XMLSecurityException {
- KeyInfoType keyInfoType;
- if (this.keyInfoType != null) {
- keyInfoType = this.keyInfoType;
- } else {
+
+ KeyInfoType keyInfoType = this.keyInfoType;
+ if (keyInfoType == null) {
keyInfoType = encryptedDataType.getKeyInfo();
}