From 4785a20bb51dc896fc0d95b9ab50557f0aba9dbd Mon Sep 17 00:00:00 2001 From: Jacques Le Roux Date: Fri, 3 Nov 2017 09:49:21 +0000 Subject: [PATCH] No functional change, completes r1813964 as suggested on dev ML git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1814155 13f79535-47bb-0310-9956-ffa450edef68 --- .../main/java/org/apache/ofbiz/entity/util/EntityCrypto.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityCrypto.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityCrypto.java index e268066486..9964aca22a 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityCrypto.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityCrypto.java @@ -124,6 +124,8 @@ public final class EntityCrypto { public Object decrypt(String keyName, EncryptMethod encryptMethod, String encryptedString) throws EntityCryptoException { try { return doDecrypt(keyName, encryptMethod, encryptedString, handlers[0]); + } catch (RuntimeException e) { + throw e; } catch (Exception e) { Debug.logInfo("Decrypt with DES key from standard key name hash failed, trying old/funny variety of key name hash", module); for (int i = 1; i < handlers.length; i++) {