projects
/
mkjsf-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'temp'
[mkjsf-moved-to-github.git]
/
src
/
main
/
java
/
com
/
indexdata
/
pz2utils4jsf
/
config
/
Pz2Config.java
diff --git
a/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2Config.java
b/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2Config.java
index
c293649
..
fc23ae2
100644
(file)
--- a/
src/main/java/com/indexdata/pz2utils4jsf/config/Pz2Config.java
+++ b/
src/main/java/com/indexdata/pz2utils4jsf/config/Pz2Config.java
@@
-29,7
+29,7
@@
public class Pz2Config implements ModuleConfigurationGetter, Serializable {
}
\r
\r
public Pz2Config (Map<String,String> parameters) {
\r
}
\r
\r
public Pz2Config (Map<String,String> parameters) {
\r
- logger.debug(Utils.objectId(this) + " being constructed with parameter map argument");
\r
+ //logger.debug(Utils.objectId(this) + " being constructed with parameter map argument");
\r
setDefaults();
\r
for (String key : parameters.keySet()) {
\r
properties.put(key, parameters.get(key));
\r
setDefaults();
\r
for (String key : parameters.keySet()) {
\r
properties.put(key, parameters.get(key));
\r
@@
-86,8
+86,8
@@
public class Pz2Config implements ModuleConfigurationGetter, Serializable {
}
\r
\r
@Override
\r
}
\r
\r
@Override
\r
- public String getConfigFilePath() {
\r
- return moduleConfig.getConfigFilePath();
\r
+ public String getConfigFilePath() {
+ return (moduleConfig != null ? moduleConfig.getConfigFilePath() : "nopath");
\r
}
\r
\r
\r
}
\r
\r
\r