fix return value

BryanMLima · BryanMLima · commit 88d32c77661b · 2023-09-19T15:55:21.000-03:00
diff --git a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -678,7 +678,8 @@ public String updateConfiguration(final long userId, final String name, final St
         // if scope is mentioned as global or not mentioned then it is normal
         // global parameter updation
         if (scope != null && !scope.isEmpty() && !ConfigKey.Scope.Global.toString().equalsIgnoreCase(scope)) {
-            if (shouldEncryptValue(category)) {
+            boolean valueEncrypted = shouldEncryptValue(category);
+            if (valueEncrypted) {
                 value = DBEncryptionUtil.encrypt(value);
             }
 
@@ -772,7 +773,8 @@ public String updateConfiguration(final long userId, final String name, final St
             default:
                 throw new InvalidParameterValueException("Scope provided is invalid");
             }
-            return DBEncryptionUtil.decrypt(value);
+
+            return valueEncrypted ? DBEncryptionUtil.decrypt(value) : value;
         }
 
         // Execute all updates in a single transaction

Original file line number	Diff line number	Diff line change
`@@ -678,7 +678,8 @@ public String updateConfiguration(final long userId, final String name, final St`
`678`	`678`	`// if scope is mentioned as global or not mentioned then it is normal`
`679`	`679`	`// global parameter updation`
`680`	`680`	`if (scope != null && !scope.isEmpty() && !ConfigKey.Scope.Global.toString().equalsIgnoreCase(scope)) {`
`681`		`- if (shouldEncryptValue(category)) {`
	`681`	`+ boolean valueEncrypted = shouldEncryptValue(category);`
	`682`	`+ if (valueEncrypted) {`
`682`	`683`	`value = DBEncryptionUtil.encrypt(value);`
`683`	`684`	`}`
`684`	`685`
`@@ -772,7 +773,8 @@ public String updateConfiguration(final long userId, final String name, final St`
`772`	`773`	`default:`
`773`	`774`	`throw new InvalidParameterValueException("Scope provided is invalid");`
`774`	`775`	`}`
`775`		`- return DBEncryptionUtil.decrypt(value);`
	`776`	`+`
	`777`	`+ return valueEncrypted ? DBEncryptionUtil.decrypt(value) : value;`
`776`	`778`	`}`
`777`	`779`
`778`	`780`	`// Execute all updates in a single transaction`