From 26cc98877980796824c42a313c45424361962b89 Mon Sep 17 00:00:00 2001
From: Reijer Copier <reijer.copier@idgis.nl>
Date: Fri, 13 Nov 2020 12:48:22 +0100
Subject: [PATCH 1/2] Add missing synchronized

---
 .../main/java/org/deegree/workspace/graph/ResourceGraph.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/deegree-core/deegree-core-workspace/src/main/java/org/deegree/workspace/graph/ResourceGraph.java b/deegree-core/deegree-core-workspace/src/main/java/org/deegree/workspace/graph/ResourceGraph.java
index 5eb7b10950..7ff1e8eefd 100644
--- a/deegree-core/deegree-core-workspace/src/main/java/org/deegree/workspace/graph/ResourceGraph.java
+++ b/deegree-core/deegree-core-workspace/src/main/java/org/deegree/workspace/graph/ResourceGraph.java
@@ -104,7 +104,7 @@ public synchronized <T extends Resource> ResourceNode<T> insertNode( ResourceMet
         return node;
     }
 
-    public <T extends Resource> void removeNode (ResourceIdentifier<T> id) {
+    public synchronized <T extends Resource> void removeNode (ResourceIdentifier<T> id) {
         nodeMap.remove( id );
         updateDependencies();
     }
@@ -140,7 +140,7 @@ private void updateDependencies() {
      * 
      * @return a sorted list of resource metadata objects, never <code>null</code>
      */
-    public List<ResourceMetadata<? extends Resource>> toSortedList() {
+    public synchronized List<ResourceMetadata<? extends Resource>> toSortedList() {
         // sketch: first add resources without dependencies, then add resources whose dependencies are met until done
         HashSet<ResourceNode<? extends Resource>> nodes = new HashSet<ResourceNode<?>>( nodeMap.values() );
 

From 2d14f8032c3121b06b8151bc055bd1d5c3b49342 Mon Sep 17 00:00:00 2001
From: Reijer Copier <reijer.copier@idgis.nl>
Date: Thu, 17 Dec 2020 08:03:44 +0100
Subject: [PATCH 2/2] Revert "#1096 set failing tests to ignore, this is a
 temporary solution"

This reverts commit 4422bc1e1cea0496cdee3dc18d0ab3a32db5acab.
---
 .../org/deegree/workspace/SimpleSqlFeatureStoreTest.java   | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/deegree-tests/deegree-resource-deps-tests/src/test/java/org/deegree/workspace/SimpleSqlFeatureStoreTest.java b/deegree-tests/deegree-resource-deps-tests/src/test/java/org/deegree/workspace/SimpleSqlFeatureStoreTest.java
index cbefb0b705..1f946dedb9 100644
--- a/deegree-tests/deegree-resource-deps-tests/src/test/java/org/deegree/workspace/SimpleSqlFeatureStoreTest.java
+++ b/deegree-tests/deegree-resource-deps-tests/src/test/java/org/deegree/workspace/SimpleSqlFeatureStoreTest.java
@@ -56,7 +56,6 @@ Occam Labs UG (haftungsbeschränkt)
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -138,7 +137,7 @@ public void testResourceGraph() {
         Assert.assertFalse( "Expected broken dependencies.", node.areDependenciesAvailable() );
     }
 
-    @Test @Ignore
+    @Test
     public void testDestroySingle() {
         FeatureStore fs = workspace.getResource( FeatureStoreProvider.class, "simplesql-ok" );
         Assert.assertNotNull( "Feature store is expected to be created.", fs );
@@ -150,7 +149,7 @@ public void testDestroySingle() {
         Assert.assertNull( "Connection provider is expected to be destroyed.", prov );
     }
 
-    @Test @Ignore
+    @Test
     public void testDestroyInitializeSingle() {
         FeatureStore fs = workspace.getResource( FeatureStoreProvider.class, "simplesql-ok" );
         Assert.assertNotNull( "Feature store is expected to be created.", fs );
@@ -164,7 +163,7 @@ public void testDestroyInitializeSingle() {
         Assert.assertNotNull( "Connection provider is expected to be re-initialized.", prov );
     }
 
-    @Test @Ignore
+    @Test
     public void testReinitializeChain() {
         FeatureStore fs = workspace.getResource( FeatureStoreProvider.class, "simplesql-ok" );
         Assert.assertNotNull( "Feature store is expected to be created.", fs );