From 124dcb7b86dfe612dcfb38a371776bc4ad5cfc61 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Wed, 10 Feb 2016 09:51:09 +0000
Subject: [PATCH] SSDM-3157: try to fix the bug: core-plugin disabling master
data registration doesn't work
SVN: 35654
---
.../common/spring/ExposablePropertyPlaceholderConfigurer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/source/java/ch/systemsx/cisd/common/spring/ExposablePropertyPlaceholderConfigurer.java b/common/source/java/ch/systemsx/cisd/common/spring/ExposablePropertyPlaceholderConfigurer.java
index 0eac3874357..5dd30ecdcb0 100644
--- a/common/source/java/ch/systemsx/cisd/common/spring/ExposablePropertyPlaceholderConfigurer.java
+++ b/common/source/java/ch/systemsx/cisd/common/spring/ExposablePropertyPlaceholderConfigurer.java
@@ -77,7 +77,6 @@ public class ExposablePropertyPlaceholderConfigurer extends PropertyPlaceholderC
final ConfigurableListableBeanFactory beanFactoryToProcess, final Properties props)
throws BeansException
{
- super.processProperties(beanFactoryToProcess, props);
resolvedProps = new Properties();
for (final Object key : props.keySet())
{
@@ -85,6 +84,7 @@ public class ExposablePropertyPlaceholderConfigurer extends PropertyPlaceholderC
resolvedProps.setProperty(keyStr, getResolvedProperty(props, keyStr));
}
injectPropertiesInto(resolvedProps);
+ super.processProperties(beanFactoryToProcess, resolvedProps);
}
protected void injectPropertiesInto(Properties properties)
--
GitLab