Skip to content

Commit 0be192c

Browse files
authored
Fix dynamic config property resolve (#3312)
1 parent 05b8961 commit 0be192c

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

app/src/main/java/io/apicurio/registry/rest/v2/AdminResourceImpl.java

+8-1
Original file line numberDiff line numberDiff line change
@@ -517,11 +517,18 @@ private ConfigurationProperty defToConfigurationProperty(DynamicConfigPropertyDe
517517
* @return the dynamic config property definition
518518
*/
519519
private DynamicConfigPropertyDef resolveConfigProperty(String propertyName) {
520-
propertyName = registryAuthPropertyToApp(propertyName);
521520
DynamicConfigPropertyDef property = dynamicPropertyIndex.getProperty(propertyName);
521+
522+
if (property == null) {
523+
propertyName = registryAuthPropertyToApp(propertyName);
524+
}
525+
//If registry property cannot be found, try with app property
526+
property = dynamicPropertyIndex.getProperty(propertyName);
527+
522528
if (property == null) {
523529
throw new ConfigPropertyNotFoundException(propertyName);
524530
}
531+
525532
if (!dynamicPropertyIndex.isAccepted(propertyName)) {
526533
throw new ConfigPropertyNotFoundException(propertyName);
527534
}

0 commit comments

Comments
 (0)