You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2025/05/29 08:10:21 UTC
(camel) 01/02: CAMEL-22118: camel-main - Cloud properties location: Optional[@@CamelMagicValue@@]
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 96af99b9c832ffd3da68cf93992a51fea800685f
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu May 29 09:28:58 2025 +0200
CAMEL-22118: camel-main - Cloud properties location: Optional[@@CamelMagicValue@@]
---
.../src/main/java/org/apache/camel/main/BaseMainSupport.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
index 8b79638863e..4b886590458 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
@@ -456,9 +456,8 @@ public abstract class BaseMainSupport extends BaseService {
Optional<String> cloudLocations = pc.resolveProperty(MainConstants.CLOUD_PROPERTIES_LOCATION);
if (cloudLocations.isPresent()) {
- LOG.info("Cloud properties location: {}", cloudLocations);
final Properties kp = tryLoadCloudProperties(op, cloudLocations.get());
- if (kp != null) {
+ if (!kp.isEmpty()) {
pc.setOverrideProperties(kp);
}
}
@@ -481,8 +480,7 @@ public abstract class BaseMainSupport extends BaseService {
}
private static Properties tryLoadCloudProperties(
- Properties overridProperties, String cloudPropertiesLocations)
- throws IOException {
+ Properties overridProperties, String cloudPropertiesLocations) {
final OrderedLocationProperties cp = new OrderedLocationProperties();
try {
String[] locations = cloudPropertiesLocations.split(",");