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

* Keep in mind that repository list may grow while we're looping over it in checkRepositories().

Browse source 
Use a hashmap instead of a long[] to track last scan times. (fixes bug 470)
This commit is contained in:
hns 2006-07-24 14:57:49 +00:00
parent 9405046ee5
commit 69cad60e86
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/helma/framework/core/TypeManager.java
View file

@ -49,7 +49,7 @@ public final class TypeManager {
private long lastCheck = 0; private long lastCheck = 0;
private long lastCodeUpdate; private long lastCodeUpdate;
private long[] lastRepoScan; private HashMap lastRepoScan;
// app specific class loader, includes jar files in the app directory // app specific class loader, includes jar files in the app directory
private AppClassLoader loader; private AppClassLoader loader;
@ -66,6 +66,7 @@ public final class TypeManager {
prototypes = new HashMap(); prototypes = new HashMap();
jarfiles = new HashSet(); jarfiles = new HashSet();
ignoreDirs = new HashSet(); ignoreDirs = new HashSet();
lastRepoScan = new HashMap();
// split ignore dirs list and add to hash set // split ignore dirs list and add to hash set
if (ignore != null) { if (ignore != null) {
String[] arr = StringUtils.split(ignore, ","); String[] arr = StringUtils.split(ignore, ",");
@ -146,8 +147,7 @@ public final class TypeManager {
} }
} else { } else {
// it's an prototype // it's an prototype
String name = null; String name = list[i].getShortName();
name = list[i].getShortName();
Prototype proto = getPrototype(name); Prototype proto = getPrototype(name);
// if prototype doesn't exist, create it // if prototype doesn't exist, create it
@ -185,17 +185,14 @@ public final class TypeManager {
*/ */
private void checkRepositories() throws IOException { private void checkRepositories() throws IOException {
List list = app.getRepositories(); List list = app.getRepositories();
// first check if we need to create or adapt our array of last scans
if (lastRepoScan == null || lastRepoScan.length != list.size()) {
lastRepoScan = new long[list.size()];
}
// walk through repositories and check if any of them have changed. // walk through repositories and check if any of them have changed.
for (int i = 0; i < lastRepoScan.length; i++) { for (int i = 0; i < list.size(); i++) {
Repository repository = (Repository) list.get(i); Repository repository = (Repository) list.get(i);
if (repository.lastModified() != lastRepoScan[i]) { long lastScan = lastRepoScan.containsKey(repository) ?
lastRepoScan[i] = repository.lastModified(); ((Long) lastRepoScan.get(repository)).longValue() : 0;
if (repository.lastModified() != lastScan) {
lastRepoScan.put(repository, new Long(repository.lastModified()));
checkRepository(repository); checkRepository(repository);
} }
} }