always remove holder when unloading

rnewson · rnewson · commit 1051692fb0a7 · 2025-04-29T11:18:35.000+01:00
diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/core/IndexManager.java b/nouveau/src/main/java/org/apache/couchdb/nouveau/core/IndexManager.java
@@ -188,9 +188,6 @@ public void unload(final String name, final boolean forceDelete) throws IOExcept
                     }
                     holder.state = HolderState.UNLOADED;
                     holder.index = null;
-                    synchronized (cache) {
-                        cache.remove(name, holder);
-                    }
                     break;
                 case NOT_LOADED:
                 case UNLOADED:
@@ -200,6 +197,9 @@ public void unload(final String name, final boolean forceDelete) throws IOExcept
                     break;
             }
         } finally {
+            synchronized (cache) {
+                cache.remove(name, holder);
+            }
             holder.lock.writeLock().unlock();
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -188,9 +188,6 @@ public void unload(final String name, final boolean forceDelete) throws IOExcept`
`188`	`188`	`}`
`189`	`189`	`holder.state = HolderState.UNLOADED;`
`190`	`190`	`holder.index = null;`
`191`		`- synchronized (cache) {`
`192`		`- cache.remove(name, holder);`
`193`		`- }`
`194`	`191`	`break;`
`195`	`192`	`case NOT_LOADED:`
`196`	`193`	`case UNLOADED:`
`@@ -200,6 +197,9 @@ public void unload(final String name, final boolean forceDelete) throws IOExcept`
`200`	`197`	`break;`
`201`	`198`	`}`
`202`	`199`	`} finally {`
	`200`	`+ synchronized (cache) {`
	`201`	`+ cache.remove(name, holder);`
	`202`	`+ }`
`203`	`203`	`holder.lock.writeLock().unlock();`
`204`	`204`	`}`
`205`	`205`	`}`