Avoiding some potential NPEs when debug logging is enabled
git-svn-id: https://svn.apache.org/repos/asf/santuario/xml-security-java/trunk@1825363 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/EncryptedKeyResolver.java b/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/EncryptedKeyResolver.java
index 631e98f..178d4df 100644
--- a/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/EncryptedKeyResolver.java
+++ b/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/EncryptedKeyResolver.java
@@ -106,12 +106,12 @@
public SecretKey engineLookupAndResolveSecretKey(
Element element, String baseURI, StorageResolver storage
) {
- LOG.debug("EncryptedKeyResolver - Can I resolve {}", element.getTagName());
-
if (element == null) {
return null;
}
+ LOG.debug("EncryptedKeyResolver - Can I resolve {}", element.getTagName());
+
SecretKey key = null;
boolean isEncryptedKey =
XMLUtils.elementIsInEncryptionSpace(element, EncryptionConstants._TAG_ENCRYPTEDKEY);
diff --git a/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RSAKeyValueResolver.java b/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RSAKeyValueResolver.java
index 32e351a..e99d476 100644
--- a/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RSAKeyValueResolver.java
+++ b/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RSAKeyValueResolver.java
@@ -40,11 +40,12 @@
public PublicKey engineLookupAndResolvePublicKey(
Element element, String baseURI, StorageResolver storage
) {
- LOG.debug("Can I resolve {}", element.getTagName());
if (element == null) {
return null;
}
+ LOG.debug("Can I resolve {}", element.getTagName());
+
boolean isKeyValue = XMLUtils.elementIsInSignatureSpace(element, Constants._TAG_KEYVALUE);
Element rsaKeyElement = null;
if (isKeyValue) {
