Code Review
/
vid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge from ECOMP's repository
[vid.git]
/
vid-app-common
/
src
/
main
/
java
/
org
/
onap
/
vid
/
properties
/
FeaturesTogglingConfiguration.java
diff --git
a/vid-app-common/src/main/java/org/onap/vid/properties/FeaturesTogglingConfiguration.java
b/vid-app-common/src/main/java/org/onap/vid/properties/FeaturesTogglingConfiguration.java
index
ef28ea4
..
88bcce8
100644
(file)
--- a/
vid-app-common/src/main/java/org/onap/vid/properties/FeaturesTogglingConfiguration.java
+++ b/
vid-app-common/src/main/java/org/onap/vid/properties/FeaturesTogglingConfiguration.java
@@
-24,16
+24,18
@@
public class FeaturesTogglingConfiguration {
public FeatureManager featureManager(ServletContext servletContext, Environment environment) {
final String defaultFilename = "features.properties";
public FeatureManager featureManager(ServletContext servletContext, Environment environment) {
final String defaultFilename = "features.properties";
- String filename = environment.getProperty("feature
Flags
.filename");
+ String filename = environment.getProperty("feature
s.set
.filename");
if (StringUtils.isBlank(filename)) {
filename = defaultFilename;
}
if (StringUtils.isBlank(filename)) {
filename = defaultFilename;
}
+ filename = StringUtils.trimToNull(filename);
+
return new FeatureManagerBuilder()
.featureEnum(Features.class)
.stateRepository(new FileBasedStateRepository(
return new FeatureManagerBuilder()
.featureEnum(Features.class)
.stateRepository(new FileBasedStateRepository(
- new File(servletContext.getRealPath("/WEB-INF/conf/" + filename))
+ new File(
filename.startsWith("/")? filename :
servletContext.getRealPath("/WEB-INF/conf/" + filename))
))
.build();
}
))
.build();
}