From 4fe7bcabf0ee76942ea061ea68e86203d39d88c5 Mon Sep 17 00:00:00 2001
From: rhanton <rick.hanton@kubra.com>
Date: Mon, 20 Aug 2018 11:09:14 -0700
Subject: [PATCH] Make decryption code fail-fast AFTER logging the error.

---
 .../encrypt/EnvironmentDecryptApplicationInitializer.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/encrypt/EnvironmentDecryptApplicationInitializer.java b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/encrypt/EnvironmentDecryptApplicationInitializer.java
index ec67ef5c..40560fce 100644
--- a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/encrypt/EnvironmentDecryptApplicationInitializer.java
+++ b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/encrypt/EnvironmentDecryptApplicationInitializer.java
@@ -198,15 +198,15 @@ public class EnvironmentDecryptApplicationInitializer implements
 						}
 						catch (Exception e) {
 							String message = "Cannot decrypt: key=" + key;
-							if (this.failOnError) {
-								throw new IllegalStateException(message, e);
-							}
 							if (logger.isDebugEnabled()) {
 								logger.warn(message, e);
 							}
 							else {
 								logger.warn(message);
 							}
+							if (this.failOnError) {
+								throw new IllegalStateException(message, e);
+							}
 							// Set value to empty to avoid making a password out of the
 							// cipher text
 							value = "";