X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.impl%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fimpl%2Fquery%2FQueryProcessor.java;fp=bundles%2Forg.simantics.db.impl%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fimpl%2Fquery%2FQueryProcessor.java;h=f1e9233eb685b7fe87cb47ca4c00704503edec9a;hb=8e67ae458c3ee4711eff252f971d9a4219d51210;hp=a54484a6566e623ae9fd4c1ea6b3dac63060572e;hpb=3850fec72035293b9a4ede780d01aedc5fbc9056;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/QueryProcessor.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/QueryProcessor.java
index a54484a65..f1e9233eb 100644
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/QueryProcessor.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/QueryProcessor.java
@@ -169,8 +169,6 @@ final public class QueryProcessor extends AbstractDisposable implements ReadGrap
 
 	ArrayList<SessionTask>[]                           delayQueues;
 	
-	public boolean synch = true;
-
 	final Object querySupportLock;
 	
 	public Long modificationCounter = 0L;
@@ -572,7 +570,17 @@ final public class QueryProcessor extends AbstractDisposable implements ReadGrap
 
 			});
 		} catch (DatabaseException e) {
-			Logger.defaultLogError(e);
+		    
+		    try {
+		        
+                procedure.exception(graph, e);
+                
+            } catch (DatabaseException e1) {
+                
+                Logger.defaultLogError(e1);
+                
+            }
+		    
 		}
 
 	}
@@ -1360,7 +1368,7 @@ final public class QueryProcessor extends AbstractDisposable implements ReadGrap
 
 		CacheEntry entry = e.entry;
 
-		System.err.println("updateQuery " + entry);
+		//System.err.println("updateQuery " + entry);
 		
 		/*
 		 * If the dependency graph forms a DAG, some entries are inserted in the
@@ -4336,48 +4344,48 @@ final public class QueryProcessor extends AbstractDisposable implements ReadGrap
 
 	}
 
-	@Override
-	final public <T> void query(final ReadGraphImpl impl, final ExternalRead<T> request, final CacheEntry parent, final Procedure<T> procedure, ListenerBase listener) {
-
-		assert(request != null);
-		assert(procedure != null);
-
-		try {
-		
-			queryPrimitiveRead(impl, request, parent, listener, new AsyncProcedure<T>() {
-	
-				@Override
-				public String toString() {
-					return procedure.toString();
-				}
-	
-				@Override
-				public void execute(AsyncReadGraph graph, T result) {
-					try {
-						procedure.execute(result);
-					} catch (Throwable t2) {
-						Logger.defaultLogError(t2);
-					}
-				}
-
-				@Override
-				public void exception(AsyncReadGraph graph, Throwable throwable) {
-					try {
-						procedure.exception(throwable);
-					} catch (Throwable t2) {
-						Logger.defaultLogError(t2);
-					}
-				}
-	
-			});
-			
-		} catch (DatabaseException e) {
-			
-			throw new IllegalStateException(e);
-			
-		}
-
-	}
+//	@Override
+//	final public <T> void query(final ReadGraphImpl impl, final ExternalRead<T> request, final CacheEntry parent, final Procedure<T> procedure, ListenerBase listener) throws DatabaseException {
+//
+//		assert(request != null);
+//		assert(procedure != null);
+//
+//		try {
+//		
+//			queryPrimitiveRead(impl, request, parent, listener, new AsyncProcedure<T>() {
+//	
+//				@Override
+//				public String toString() {
+//					return procedure.toString();
+//				}
+//	
+//				@Override
+//				public void execute(AsyncReadGraph graph, T result) {
+//					try {
+//						procedure.execute(result);
+//					} catch (Throwable t2) {
+//						Logger.defaultLogError(t2);
+//					}
+//				}
+//
+//				@Override
+//				public void exception(AsyncReadGraph graph, Throwable throwable) {
+//					try {
+//						procedure.exception(throwable);
+//					} catch (Throwable t2) {
+//						Logger.defaultLogError(t2);
+//					}
+//				}
+//	
+//			});
+//			
+//		} catch (DatabaseException e) {
+//			
+//			throw new IllegalStateException(e);
+//			
+//		}
+//
+//	}
 
 	@Override
 	public VirtualGraph getProvider(Resource subject, Resource predicate, Resource object) {