(camel) branch main updated: camel-main - Avoid adding duplicate properties location in camel-main

[davsclaus]

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


The following commit(s) were added to refs/heads/main by this push:
     new 050c4c8b986 camel-main - Avoid adding duplicate properties location in 
camel-main
050c4c8b986 is described below

commit 050c4c8b986fbde7a681825dd551193490c99cfa
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed May 15 20:26:40 2024 +0200

    camel-main - Avoid adding duplicate properties location in camel-main
---
 .../src/main/java/org/apache/camel/main/BaseMainSupport.java          | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 b7f7f0fc6e3..8ef5d715da3 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
@@ -384,7 +384,9 @@ public abstract class BaseMainSupport extends BaseService {
                 if (profile != null) {
                     mainConfigurationProperties.setProfile(profile);
                     String loc = profilePropertyPlaceholderLocation(profile);
-                    defaultPropertyPlaceholderLocation = loc + "," + 
defaultPropertyPlaceholderLocation;
+                    if (!defaultPropertyPlaceholderLocation.contains(loc)) {
+                        defaultPropertyPlaceholderLocation = loc + "," + 
defaultPropertyPlaceholderLocation;
+                    }
                 }
                 locations
                         = 
MainHelper.lookupPropertyFromSysOrEnv(MainConstants.PROPERTY_PLACEHOLDER_LOCATION)