Merge branch 'private/db-threads' into private/threads-testing

[simantics/platform.git] / bundles / org.simantics.db.impl / src / org / simantics / db / impl / query / URIToResource.java

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/URIToResource.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/URIToResource.java
index 78ae0d12d0ba0a147ca79b7ac65f894952e2bf47..794bcc8edc3258fdee965278321c41f8e3789156 100644 (file)
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/URIToResource.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/URIToResource.java
@@ -15,6 +15,7 @@ import org.simantics.databoard.util.URIStringUtils;
 import org.simantics.db.ObjectResourceIdMap;
 import org.simantics.db.common.exception.DebugException;
 import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.exception.ResourceNotFoundException;
 import org.simantics.db.impl.graph.ReadGraphImpl;
 import org.simantics.db.impl.procedure.InternalProcedure;
 
@@ -29,7 +30,7 @@ public class URIToResource extends StringQuery<InternalProcedure<Integer>> {
        provider.cache.remove(this);
     }
     
-    @Override
+    //@Override
     public Object compute(ReadGraphImpl graph, final InternalProcedure<Integer> procedure) throws DatabaseException {
        computeForEach(graph, id, this, procedure);
         return getResult();
@@ -61,7 +62,7 @@ public class URIToResource extends StringQuery<InternalProcedure<Integer>> {
                
             } else {
                
-               DatabaseException e = new DatabaseException("No URI for " + id);
+                ResourceNotFoundException e = new ResourceNotFoundException("No resource for URI: " + id);
                if(entry != null) entry.except(e);
                procedure.exception(graph, e);