Merge "Multiple reader thread support for db client"

[simantics/platform.git] / bundles / org.simantics.db.layer0 / src / org / simantics / db / layer0 / util / ModelTransferableGraphSourceRequest.java

diff --git a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/ModelTransferableGraphSourceRequest.java b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/ModelTransferableGraphSourceRequest.java
index b7fe6ed7b29f4cf3c9b45358e13eb9f32544dc31..c5cb20af2c6d2ada95446a61cacdd3fa723747c0 100644 (file)
--- a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/ModelTransferableGraphSourceRequest.java
+++ b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/ModelTransferableGraphSourceRequest.java
@@ -81,7 +81,8 @@ public class ModelTransferableGraphSourceRequest extends UniqueRead<ModelTransfe
 
        public static String LOG_FILE = "transferableGraph.log";
        final static boolean LOG = false;
-       final static private boolean DEBUG = false;
+       final static boolean PRINTDEBUG = false;
+       final static boolean DEBUG = LOG | PRINTDEBUG;
        final static boolean PROFILE = false;
        
        private TransferableGraphConfiguration2 configuration;
@@ -103,8 +104,10 @@ public class ModelTransferableGraphSourceRequest extends UniqueRead<ModelTransfe
        }
        
        static void log(String line) {
+               if (PRINTDEBUG) System.err.println(line);
                if (LOG) {
                        try {
+                               if(line.length() > 500) line = line.substring(0, 500);
                                log.writeUTF(line + "\n");
                        } catch (IOException e) {
                                e.printStackTrace();
@@ -575,15 +578,15 @@ public class ModelTransferableGraphSourceRequest extends UniqueRead<ModelTransfe
 
                        final DirectQuerySupport dqs = graph.getService(DirectQuerySupport.class);
 
-                       final DomainStatementProcedure3 proc = new DomainStatementProcedure3(result);
+//                     final DomainStatementProcedure3 proc = new DomainStatementProcedure3(result);
 
                        if (ignoreVirtual) {
                                for(Resource r : roots) {
-                                       dqs.forEachDirectPersistentStatement(graph, r, proc);
+                                       result.add(dqs.getDirectPersistentStatements(graph, r));
                                }
                        } else {
                                for(Resource r : roots) {
-                                       dqs.forEachDirectStatement(graph, r, proc);
+                                       result.add(dqs.getDirectStatements(graph, r));
                                }
                        }