X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=bundles%2Forg.simantics.db.procore%2Fsrc%2Ffi%2Fvtt%2Fsimantics%2Fprocore%2Finternal%2FSessionRequestManager.java;h=2902274b94202c9c79610f006f5acbf91365338b;hb=d0e8f57df83c175bac2098412ee71646fb9ff0e9;hp=3209961ed61519ac4e22ba100f20ff9882cbd1be;hpb=1a8971ec56f21b4532e22d787c3f5a15df0b5f2b;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 3209961ed..2902274b9 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
@@ -6,7 +6,6 @@ import java.util.LinkedList;
 
 import org.simantics.db.Disposable;
 import org.simantics.db.Resource;
-import org.simantics.db.common.utils.Logger;
 import org.simantics.db.exception.CancelTransactionException;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.impl.graph.WriteGraphImpl;
@@ -16,9 +15,13 @@ import org.simantics.db.impl.query.QueryProcessor.SessionRead;
 import org.simantics.db.impl.query.QueryProcessor.SessionTask;
 import org.simantics.db.request.WriteTraits;
 import org.simantics.utils.datastructures.Pair;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class SessionRequestManager {
 
+	private static final Logger LOGGER = LoggerFactory.getLogger(SessionRequestManager.class);
+
 	private static boolean DEBUG = false;
 	
 	enum State {
@@ -123,7 +126,7 @@ public class SessionRequestManager {
                     transactionState.startReadTransaction(thread);
                     task.run(thread);
                 } catch (Throwable t) {
-                    Logger.defaultLogError(new DatabaseException("Read transaction could not be started", t));
+                    LOGGER.error("Read transaction could not be started", t);
                     if(task.throwable != null)
                         task.throwable.set(t);
                     state = State.ERROR;
@@ -149,7 +152,7 @@ public class SessionRequestManager {
 				try {
 					transactionState.stopReadTransaction();
 				} catch (DatabaseException e) {
-					e.printStackTrace();
+					LOGGER.error("Read transaction could not be stopped", e);
 				}
 				
 			}
@@ -158,16 +161,6 @@ public class SessionRequestManager {
 		
 	}
 
-//	public synchronized void stopRead(int thread) {
-//		
-//		try {
-//			transactionState.stopReadTransaction();
-//		} catch (DatabaseException e) {
-//			e.printStackTrace();
-//		}
-//		
-//	}
-
 	public synchronized void startWrite(int thread, final SessionTask task) {
 		
 		session.queryProvider2.schedule(new SessionTask(true) {
@@ -178,8 +171,7 @@ public class SessionRequestManager {
 		        try {
 		        	transactionState.startWriteTransaction(thread);
 		        } catch (Throwable t) {
-		            DatabaseException e = new DatabaseException("Write transaction could not be started", t);
-		            Logger.defaultLogError(e);
+		            LOGGER.error("Write transaction could not be started", t);
 		            return;
 		        }
 				task.run(thread);
@@ -230,10 +222,10 @@ public class SessionRequestManager {
 				WriteGraphImpl graph = writeState.getGraph();
 
 				if(writeState.isExcepted()) {
-				    
+
 				    if(!(writeState.exception instanceof CancelTransactionException))
-				        writeState.exception.printStackTrace();
-				    
+				        LOGGER.error("Write request failed", writeState.exception);
+
 				    transactionState.cancelWriteTransaction(graph);
 
 				} else {
@@ -260,20 +252,6 @@ public class SessionRequestManager {
 
 	}
 
-//	public synchronized void stopWrite(int thread) {
-//		
-//        session.clientChanges = new ClientChangesImpl(session);
-//
-//        WriteState<?> state = session.writeState;
-//
-//        System.err.println("D");
-//        state.finish();
-//        System.err.println("E");
-//        
-//        session.writeState = null;
-//        
-//	}
-
 	public synchronized void ceased(int thread) {
 
 		if(State.WRITE == state) {
@@ -408,7 +386,7 @@ public class SessionRequestManager {
 			try {
 				value.second.binaryFile.close();
 			} catch (IOException e) {
-				Logger.defaultLogError("I/O exception while closing random access value file " + value.second.binaryFile.file() + " for resource " + value.first , e);
+				LOGGER.error("I/O exception while closing random access value file " + value.second.binaryFile.file() + " for resource " + value.first , e);
 			}
 		}
 	}