Fixed argument passing in async/sync read/write SCL functions 87/3787/2
authorTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Thu, 16 Jan 2020 10:44:10 +0000 (12:44 +0200)
committerTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Thu, 16 Jan 2020 10:44:10 +0000 (12:44 +0200)
These arguments haven't really been used in SCL code invoking syncRead,
syncWrite, asyncRead or asyncWrite which is why these have gone
unnoticed for quite long.

gitlab #321

Change-Id: Ia879115e3a9c73059691f53b5bdbac64afb9d4ab

1  2 
bundles/org.simantics.scl.db/src/org/simantics/scl/db/SCLFunctions.java

index 9f242b28c8efade8dc8d606d4c6409bd94b86a69,9f242b28c8efade8dc8d606d4c6409bd94b86a69..bca7ba2481ff641b5a7d4c300ed80642cb751ac2
@@@ -177,7 -177,7 +177,7 @@@ public class SCLFunctions 
  
      private static Object[] NO_ARGS = new Object[] { Tuple0.INSTANCE };
  
--    public static <T> void asyncRead(final Function f) throws DatabaseException {    
++    public static <T> void asyncRead(final Function f) throws DatabaseException {
          asyncRead(f, NO_ARGS);
      }
  
                  SCLContext.push(context);
                  context.put(GRAPH, graph);
                  try {
--                    f.apply(Tuple0.INSTANCE);
++                    f.applyArray(args);
                  } finally {
                      SCLContext.pop();
                  }
                      SCLContext.push(context);
                      ReadGraph oldGraph = (ReadGraph)context.put(GRAPH, graph);
                      try {
--                        return (T)f.apply(Tuple0.INSTANCE);
++                        return (T)f.applyArray(args);
                      } finally {
                          context.put(GRAPH, oldGraph);
                          SCLContext.pop();
                      SCLContext.push(context);
                      context.put(GRAPH, graph);
                      try {
--                        f.apply(args);
++                        f.applyArray(args);
                      } finally {
                          SCLContext.pop();
                      }
          final SCLContext context = SCLContext.getCurrent();
          Object graph = context.get(GRAPH);
          if (graph != null && graph instanceof WriteGraph) {
--            return (T)f.apply(Tuple0.INSTANCE);
++            return (T)f.applyArray(args);
          } else {
              if (graph != null) {
                  LOGGER.error(
                      SCLReportingHandler oldPrinter = (SCLReportingHandler)context.put(SCLReportingHandler.REPORTING_HANDLER, printer);
                      ReadGraph oldGraph = (ReadGraph)context.put(GRAPH, graph);
                      try {
--                        return (T)f.apply(args);
++                        return (T)f.applyArray(args);
                      } finally {
                          context.put(GRAPH, oldGraph);
                          context.put(SCLReportingHandler.REPORTING_HANDLER, oldPrinter);