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 5eb7b10950e..7ff1e8eefdf 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 ResourceNode insertNode( ResourceMet return node; } - public void removeNode (ResourceIdentifier id) { + public synchronized void removeNode (ResourceIdentifier id) { nodeMap.remove( id ); updateDependencies(); } @@ -140,7 +140,7 @@ private void updateDependencies() { * * @return a sorted list of resource metadata objects, never null */ - public List> toSortedList() { + public synchronized List> toSortedList() { // sketch: first add resources without dependencies, then add resources whose dependencies are met until done HashSet> nodes = new HashSet>( nodeMap.values() ); 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 cbefb0b7057..1f946dedb93 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 );