From 69cad60e86b3d1ff55bef003df87209582da565f Mon Sep 17 00:00:00 2001
From: hns <hannesw@gmail.com>
Date: Mon, 24 Jul 2006 14:57:49 +0000
Subject: [PATCH] * Keep in mind that repository list may grow while we're
 looping over it in checkRepositories().   Use a hashmap instead of a long[]
 to track last scan times. (fixes bug 470)

---
 src/helma/framework/core/TypeManager.java | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/helma/framework/core/TypeManager.java b/src/helma/framework/core/TypeManager.java
index ef5f6404..7ee68696 100644
--- a/src/helma/framework/core/TypeManager.java
+++ b/src/helma/framework/core/TypeManager.java
@@ -49,7 +49,7 @@ public final class TypeManager {
 
     private long lastCheck = 0;
     private long lastCodeUpdate;
-    private long[] lastRepoScan;
+    private HashMap lastRepoScan;
 
     // app specific class loader, includes jar files in the app directory
     private AppClassLoader loader;
@@ -66,6 +66,7 @@ public final class TypeManager {
         prototypes = new HashMap();
         jarfiles = new HashSet();
         ignoreDirs = new HashSet();
+        lastRepoScan = new HashMap();
         // split ignore dirs list and add to hash set
         if (ignore != null) {
             String[] arr = StringUtils.split(ignore, ",");
@@ -146,8 +147,7 @@ public final class TypeManager {
                 }
             } else {
                 // it's an prototype
-                String name = null;
-                name = list[i].getShortName();
+                String name = list[i].getShortName();
                 Prototype proto = getPrototype(name);
 
                 // if prototype doesn't exist, create it
@@ -185,17 +185,14 @@ public final class TypeManager {
      */
     private void checkRepositories() throws IOException {
         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.
-        for (int i = 0; i < lastRepoScan.length; i++) {
+        for (int i = 0; i < list.size(); i++) {
             Repository repository = (Repository) list.get(i);
-            if (repository.lastModified() != lastRepoScan[i]) {
-                lastRepoScan[i] = repository.lastModified();
-
+            long lastScan = lastRepoScan.containsKey(repository) ?
+                    ((Long) lastRepoScan.get(repository)).longValue() : 0;
+            if (repository.lastModified() != lastScan) {
+                lastRepoScan.put(repository, new Long(repository.lastModified()));
                 checkRepository(repository);
             }
         }