diff --git a/multiapps-mta/src/main/java/org/cloudfoundry/multiapps/mta/resolvers/PropertiesResolver.java b/multiapps-mta/src/main/java/org/cloudfoundry/multiapps/mta/resolvers/PropertiesResolver.java index 88b32046..efbe220e 100644 --- a/multiapps-mta/src/main/java/org/cloudfoundry/multiapps/mta/resolvers/PropertiesResolver.java +++ b/multiapps-mta/src/main/java/org/cloudfoundry/multiapps/mta/resolvers/PropertiesResolver.java @@ -73,7 +73,7 @@ public Object visit(String key, String value) { private Object resolveReferences(String key, String value) { List references = detectReferences(value); if (isSimpleReference(value, references)) { - return resolveReferenceInContext(key, references.get(0)); + return resolveReferenceInContext(key, references.get(0), false); } StringBuilder result = new StringBuilder(value); for (Reference reference : references) { @@ -101,10 +101,6 @@ private boolean isSimpleReference(String value, List references) { .length(); } - protected Object resolveReferenceInContext(String key, Reference reference) { - return resolveReferenceInContext(key, reference, false); - } - protected Object resolveReferenceInContext(String key, Reference reference, boolean shouldBackupContext) { boolean resolutionContextWasCreated = false; HashSet contextKeysBackup = null; @@ -112,7 +108,7 @@ protected Object resolveReferenceInContext(String key, Reference reference, bool resolutionContext = new ResolutionContext(NameUtil.getPrefixedName(prefix, key)); resolutionContextWasCreated = true; } else if (shouldBackupContext) { - // if multiple refs are resolved sequentially in a value - backup and revert context after each ref + // if multiple refs are resolved sequentially in a value - backup and revert context after each resolution contextKeysBackup = new HashSet<>(resolutionContext.referencedKeys); } Object resolvedValue = resolveReference(reference);