[Bugfix] fixed bug in RuntimeConfiguration
- the methods getConfigFile and getDataFile() didn't properly evaluate if they should throw an exception if a directory or file does not exist
This commit is contained in:
parent
70ec912446
commit
f847ff3208
|
@ -112,7 +112,7 @@ public class RuntimeConfiguration extends AbstractionConfiguration {
|
||||||
*/
|
*/
|
||||||
public File getConfigFile(String context, String fileName, boolean checkExists) {
|
public File getConfigFile(String context, String fileName, boolean checkExists) {
|
||||||
File configFile = new File(getDataPath(), fileName);
|
File configFile = new File(getDataPath(), fileName);
|
||||||
if (checkExists && !configFile.isFile() || !configFile.canRead()) {
|
if (checkExists && (!configFile.isFile() || !configFile.canRead())) {
|
||||||
String msg = "[{0}] requires config file which does not exist with name: {1}"; //$NON-NLS-1$
|
String msg = "[{0}] requires config file which does not exist with name: {1}"; //$NON-NLS-1$
|
||||||
msg = MessageFormat.format(msg, getName(), context, fileName);
|
msg = MessageFormat.format(msg, getName(), context, fileName);
|
||||||
throw new StrolchConfigurationException(msg);
|
throw new StrolchConfigurationException(msg);
|
||||||
|
@ -134,7 +134,7 @@ public class RuntimeConfiguration extends AbstractionConfiguration {
|
||||||
*/
|
*/
|
||||||
public File getDataFile(String context, String fileName, boolean checkExists) {
|
public File getDataFile(String context, String fileName, boolean checkExists) {
|
||||||
File dataFile = new File(getDataPath(), fileName);
|
File dataFile = new File(getDataPath(), fileName);
|
||||||
if (checkExists && !dataFile.isFile() || !dataFile.canRead()) {
|
if (checkExists && (!dataFile.isFile() || !dataFile.canRead())) {
|
||||||
String msg = "[{0}] requires data file which does not exist with name: {1}"; //$NON-NLS-1$
|
String msg = "[{0}] requires data file which does not exist with name: {1}"; //$NON-NLS-1$
|
||||||
msg = MessageFormat.format(msg, getName(), context, fileName);
|
msg = MessageFormat.format(msg, getName(), context, fileName);
|
||||||
throw new StrolchConfigurationException(msg);
|
throw new StrolchConfigurationException(msg);
|
||||||
|
@ -156,7 +156,7 @@ public class RuntimeConfiguration extends AbstractionConfiguration {
|
||||||
*/
|
*/
|
||||||
public File getDataDir(String context, String dirName, boolean checkExists) {
|
public File getDataDir(String context, String dirName, boolean checkExists) {
|
||||||
File dataDir = new File(getDataPath(), dirName);
|
File dataDir = new File(getDataPath(), dirName);
|
||||||
if (checkExists && !dataDir.isDirectory() || !dataDir.canRead()) {
|
if (checkExists && (!dataDir.isDirectory() || !dataDir.canRead())) {
|
||||||
String msg = "[{0}] requires data directory which does not exist with name: {1}"; //$NON-NLS-1$
|
String msg = "[{0}] requires data directory which does not exist with name: {1}"; //$NON-NLS-1$
|
||||||
msg = MessageFormat.format(msg, getName(), context, dirName);
|
msg = MessageFormat.format(msg, getName(), context, dirName);
|
||||||
throw new StrolchConfigurationException(msg);
|
throw new StrolchConfigurationException(msg);
|
||||||
|
|
Loading…
Reference in New Issue