Yet another fixing commit

[simantics/platform.git] / bundles / org.simantics.db.procore / src / fi / vtt / simantics / procore / internal / SessionImplSocket.java

diff --git a/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/SessionImplSocket.java b/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/SessionImplSocket.java
index 91faecfb752986a6eb1694f4d70e2b671271b5f8..a3d3c630e1677a4cd029fa0ac0fb6c66aa02e4a0 100644 (file)
--- a/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/SessionImplSocket.java
+++ b/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/SessionImplSocket.java
@@ -1653,29 +1653,11 @@ public abstract class SessionImplSocket implements Session, WriteRequestSchedule
 
                             request.perform(newGraph, wrap);
                             wrap.get();
-<<<<<<< Upstream, based on branch 'private/antti_threads' of ssh://villberg@gerrit.simantics.org:29418/simantics/platform.git
-=======
 
                         } catch (DatabaseException e) {
 
                                                        Logger.defaultLogError(e);
 
-//                             wrap.exception(newGraph, t);
-//                            wrapper.exception(newGraph, t);
-//                            newGraph.waitAsync(request);
->>>>>>> 82fa68e Generate parts of db client query code
-
-<<<<<<< Upstream, based on branch 'private/antti_threads' of ssh://villberg@gerrit.simantics.org:29418/simantics/platform.git
-                        } catch (Throwable t) {
-
-                               wrap.exception(newGraph, t);
-                               
-//                            wrapper.exception(newGraph, t);
-//                            newGraph.waitAsync(request);
-
-
-=======
->>>>>>> 82fa68e Generate parts of db client query code
                         }
 
                     }