You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2021/06/19 22:05:18 UTC

[sling-org-apache-sling-commons-crypto] 03/04: remove check (IvGenerator is mandatory)

This is an automated email from the ASF dual-hosted git repository.

olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-crypto.git

commit 4ed8299c455469ff95163dbca5d8c427f70a61d8
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Jun 19 23:56:24 2021 +0200

    remove check (IvGenerator is mandatory)
---
 .../crypto/jasypt/internal/JasyptStandardPBEStringCryptoService.java  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptStandardPBEStringCryptoService.java b/src/main/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptStandardPBEStringCryptoService.java
index ad806c1..90f00d8 100644
--- a/src/main/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptStandardPBEStringCryptoService.java
+++ b/src/main/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptStandardPBEStringCryptoService.java
@@ -104,9 +104,7 @@ public class JasyptStandardPBEStringCryptoService implements CryptoService {
         // mandatory
         encryptor.setAlgorithm(algorithm);
         final IvGenerator ivGenerator = this.ivGenerator;
-        if (Objects.nonNull(ivGenerator)) {
-            encryptor.setIvGenerator(ivGenerator);
-        }
+        encryptor.setIvGenerator(ivGenerator);
         // optional
         encryptor.setKeyObtentionIterations(configuration.keyObtentionIterations());
         encryptor.setStringOutputType(configuration.stringOutputType());