+ } 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