Author: jleroux
Date: Fri Nov 3 09:49:21 2017
New Revision: 1814155
URL: http://svn.apache.org/viewvc?rev=1814155&view=rev
Log:
No functional change, completes r1813964 as suggested on dev ML
Modified:
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityCrypto.java
Modified:
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityCrypto.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityCrypto.java?rev=1814155&r1=1814154&r2=1814155&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityCrypto.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityCrypto.java
Fri Nov 3 09:49:21 2017
@@ -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++) {
