Fix NPE for resource with pwd-as-config (MID-5046)

Evolveum · Feb 28, 2019 · 48c515c · 48c515c
1 parent 9734453
commit 48c515c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/infra/common/src/main/java/com/evolveum/midpoint/common/crypto/CryptoUtil.java b/infra/common/src/main/java/com/evolveum/midpoint/common/crypto/CryptoUtil.java
@@ -200,7 +200,7 @@ private static void checkEncrypted(PrismPropertyValue<?> pval) {
 		    @SuppressWarnings("unchecked")
 		    PrismPropertyValue<ProtectedStringType> psPval = (PrismPropertyValue<ProtectedStringType>)pval;
             ProtectedStringType ps = psPval.getValue();
-            if (ps.getClearValue() != null) {
+            if (ps != null && ps.getClearValue() != null) {
                 throw new IllegalStateException("Unencrypted value in field " + propName);
             }
         } else if (itemDef.getTypeName().equals(MailConfigurationType.COMPLEX_TYPE)) {