- added NeuronProvider duplicate check

lukas.molzberger · lukas.molzberger · commit b016594819c8 · 2024-03-18T07:23:30.000+01:00
diff --git a/core/src/main/java/network/aika/Model.java b/core/src/main/java/network/aika/Model.java
@@ -231,18 +231,21 @@ private void suspend(NeuronProvider p, boolean saveOnSuspend) {
             p.suspend(saveOnSuspend);
     }
 
-    public void register(NeuronProvider p) {
+    public void register(NeuronProvider np) {
         synchronized (providers) {
-            NeuronProvider existingNP = providers.put(p.getId(), p);
+            NeuronProvider existingNP = providers.put(np.getId(), np);
 
             if(existingNP != null)
-                LOG.error("Attempted to overwrite existing Provider: (np:" + p.getId() + ")");
+                LOG.error("Attempted to overwrite existing Provider: (np:" + np.getId() + ")");
         }
     }
 
-    public void unregister(NeuronProvider p) {
+    public void unregister(NeuronProvider np) {
         synchronized (providers) {
-            providers.remove(p.getId());
+            NeuronProvider removedNP = providers.remove(np.getId());
+
+            if(removedNP != np)
+                LOG.error("Attempted to remove a duplicate Provider: (np:" + np.getId() + ")");
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -231,18 +231,21 @@ private void suspend(NeuronProvider p, boolean saveOnSuspend) {`
`231`	`231`	`p.suspend(saveOnSuspend);`
`232`	`232`	`}`
`233`	`233`
`234`		`- public void register(NeuronProvider p) {`
	`234`	`+ public void register(NeuronProvider np) {`
`235`	`235`	`synchronized (providers) {`
`236`		`- NeuronProvider existingNP = providers.put(p.getId(), p);`
	`236`	`+ NeuronProvider existingNP = providers.put(np.getId(), np);`
`237`	`237`
`238`	`238`	`if(existingNP != null)`
`239`		`- LOG.error("Attempted to overwrite existing Provider: (np:" + p.getId() + ")");`
	`239`	`+ LOG.error("Attempted to overwrite existing Provider: (np:" + np.getId() + ")");`
`240`	`240`	`}`
`241`	`241`	`}`
`242`	`242`
`243`		`- public void unregister(NeuronProvider p) {`
	`243`	`+ public void unregister(NeuronProvider np) {`
`244`	`244`	`synchronized (providers) {`
`245`		`- providers.remove(p.getId());`
	`245`	`+ NeuronProvider removedNP = providers.remove(np.getId());`
	`246`	`+`
	`247`	`+ if(removedNP != np)`
	`248`	`+ LOG.error("Attempted to remove a duplicate Provider: (np:" + np.getId() + ")");`
`246`	`249`	`}`
`247`	`250`	`}`
`248`	`251`