antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

Improve repository lookup code and error message.

Browse source
This commit is contained in:
hns 2009-02-17 16:04:53 +00:00
parent 99cfdfd6f6
commit 829d4ead3c
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/helma/framework/core/ApplicationBean.java
View file

@ -145,11 +145,11 @@ public class ApplicationBean implements Serializable {
if (obj instanceof String) { if (obj instanceof String) {
String path = (String) obj; String path = (String) obj;
File file = findResource(null, path); File file = findResource(null, path);
if (!file.exists()) { if (file == null) {
file = findResource(app.hopHome, path); file = findResource(app.hopHome, path);
} if (file == null) {
if (!file.exists()) { throw new RuntimeException("Repository not found: " + path);
throw new RuntimeException("Repository path does not exist: " + file); }
} }
if (file.isDirectory()) { if (file.isDirectory()) {
rep = new FileRepository(file); rep = new FileRepository(file);
@ -176,20 +176,21 @@ public class ApplicationBean implements Serializable {
} }
/** /**
* Helper method to resolve a repository path. * Helper method to resolve a repository path. Returns null if no file is found.
* @param parent the parent file * @param parent the parent file
* @param path the repository path * @param path the repository path
* @return our best guess of what the file may be * @return an existing file, or null
*/ */
private File findResource(File parent, String path) { private File findResource(File parent, String path) {
File file = new File(parent, path).getAbsoluteFile(); File file = new File(parent, path).getAbsoluteFile();
if (!file.exists()) { if (!file.exists()) {
// if file does not exist, try with .zip and .js extensions appended
file = new File(parent, path + ".zip").getAbsoluteFile(); file = new File(parent, path + ".zip").getAbsoluteFile();
if (!file.exists()) {
file = new File(parent, path + ".js").getAbsoluteFile();
}
} }
if (!file.exists()) { return file.exists() ? file : null;
file = new File(parent, path + ".js").getAbsoluteFile();
}
return file;
} }
/** /**