X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.procore%2Fsrc%2Ffi%2Fvtt%2Fsimantics%2Fprocore%2Finternal%2FSessionImplSocket.java;fp=bundles%2Forg.simantics.db.procore%2Fsrc%2Ffi%2Fvtt%2Fsimantics%2Fprocore%2Finternal%2FSessionImplSocket.java;h=91faecfb752986a6eb1694f4d70e2b671271b5f8;hb=25b0e1909c94977871479b469da722ed38e980c0;hp=6d34d9341c425bbdd465616af54a12d6e3e62cf4;hpb=6326b65c5c6a785aadcb615cb95ceadd8f53964a;p=simantics%2Fplatform.git

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 6d34d9341..91faecfb7 100644
--- 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,7 +1653,19 @@ 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);
@@ -1662,6 +1674,8 @@ public abstract class SessionImplSocket implements Session, WriteRequestSchedule
 //                            newGraph.waitAsync(request);
 
 
+=======
+>>>>>>> 82fa68e Generate parts of db client query code
                         }
 
                     }