X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.procore%2Fsrc%2Ffi%2Fvtt%2Fsimantics%2Fprocore%2Finternal%2FSessionRequestManager.java;h=3209961ed61519ac4e22ba100f20ff9882cbd1be;hb=1a8971ec56f21b4532e22d787c3f5a15df0b5f2b;hp=5bdec52e99cfcb3cdb71010584250904e65ad9ac;hpb=e3290cc52342e783a2617f3009fff8e6f3e54560;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/SessionRequestManager.java b/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/SessionRequestManager.java
index 5bdec52e9..3209961ed 100644
--- a/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/SessionRequestManager.java
+++ b/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/SessionRequestManager.java
@@ -115,7 +115,7 @@ public class SessionRequestManager {
 	
 	public synchronized void startRead(int thread, final SessionRead task) {
 		
-		session.queryProvider2.scheduleAlways(thread, new SessionTask(task.object, task.thread, task.syncCaller) {
+		session.queryProvider2.schedule(new SessionTask(true) {
 
 			@Override
             public void run(int thread) {
@@ -139,7 +139,7 @@ public class SessionRequestManager {
 	
 	public synchronized void startReadUpdate(int thread) {
 		
-		session.queryProvider2.scheduleAlways(thread, new SessionTask(null, thread) {
+		session.queryProvider2.schedule(new SessionTask(true) {
 
 			@Override
 			public void run(int thread) {
@@ -170,7 +170,7 @@ public class SessionRequestManager {
 
 	public synchronized void startWrite(int thread, final SessionTask task) {
 		
-		session.queryProvider2.scheduleAlways(thread, new SessionTask((WriteTraits)task.object, task.thread) {
+		session.queryProvider2.schedule(new SessionTask(true) {
 
 			@Override
 			public void run(int thread) {
@@ -192,7 +192,7 @@ public class SessionRequestManager {
 
 	public synchronized void startWriteUpdate(int thread) {
 		
-		session.queryProvider2.scheduleAlways(thread, new SessionTask(null, thread) {
+		session.queryProvider2.schedule(new SessionTask(true) {
 
 			@Override
 			public void run(int thread) {
@@ -224,6 +224,9 @@ public class SessionRequestManager {
 				if(!session.state.isAlive()) return;
 
 				WriteState<?> writeState = session.writeState;
+				
+				assert(writeState != null);
+				
 				WriteGraphImpl graph = writeState.getGraph();
 
 				if(writeState.isExcepted()) {
@@ -290,7 +293,7 @@ public class SessionRequestManager {
 			if (!reads.isEmpty()) {
 
 				final SessionRead read = reads.poll();
-				session.queryProvider2.scheduleAlways(thread, new SessionTask(read.object, read.thread, read.syncCaller) {
+				session.queryProvider2.schedule(new SessionTask(true) {
 
 					@Override
 					public void run(int thread) {
@@ -318,7 +321,9 @@ public class SessionRequestManager {
 			
 		} else {
 
-		    throw new IllegalStateException("State in ceased should be WRITE or READ or INIT (was " + state + ")"); 
+			// Spurious wakeup
+			
+		    //throw new IllegalStateException("State in ceased should be WRITE or READ or INIT (was " + state + ")"); 
 			
 		}
 		
@@ -329,7 +334,7 @@ public class SessionRequestManager {
 		assert(State.INIT != state);
 		
 		if(State.READ == state) {
-			session.queryProvider2.schedule(Integer.MIN_VALUE, new SessionTask(task.object, task.thread, task.syncCaller) {
+			session.queryProvider2.schedule(new SessionTask(true) {
 
 				@Override
 				public void run(int thread) {
@@ -371,6 +376,8 @@ public class SessionRequestManager {
 
 		boolean inUpdate = state == State.WRITE_UPDATE;
 
+		//System.err.println("schedule write " + task);
+		
 		assert(State.INIT != state);
 		//task.combine = combine != null ? combine : inUpdate;
 		if(State.IDLE == state) {