X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.services%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fservices%2Fadaption%2FAdaptionService2.java;h=859481727bfe9f701f53cbe462dc5ecb6219b83b;hb=1a8971ec56f21b4532e22d787c3f5a15df0b5f2b;hp=7cc87e30b155869c4219b47ac045404cd9361b1d;hpb=68ce0966a57f5153b133c6283fdbae10f683b745;p=simantics%2Fplatform.git diff --git a/bundles/org.simantics.db.services/src/org/simantics/db/services/adaption/AdaptionService2.java b/bundles/org.simantics.db.services/src/org/simantics/db/services/adaption/AdaptionService2.java index 7cc87e30b..859481727 100644 --- a/bundles/org.simantics.db.services/src/org/simantics/db/services/adaption/AdaptionService2.java +++ b/bundles/org.simantics.db.services/src/org/simantics/db/services/adaption/AdaptionService2.java @@ -39,6 +39,8 @@ import org.simantics.layer0.Layer0; import org.simantics.utils.datastructures.Pair; public class AdaptionService2 implements AdaptionService { + + int foobaz; THashMap,Class>, AdapterDeclaration> adapters = new THashMap,Class>, AdapterDeclaration>(); @@ -586,10 +588,11 @@ public class AdaptionService2 implements AdaptionService { Adapter adapter = getAdapter(g, r, context, contextClass, targetClass, possible); if(adapter == null) return null; - BlockingAsyncProcedure ap = new BlockingAsyncProcedure(null, adapter); + BlockingAsyncProcedure ap = new BlockingAsyncProcedure(g, null, adapter); // SyncReadProcedure procedure = new SyncReadProcedure(); adapter.adapt(g, r, context, ap); + return ap.get(); // procedure.checkAndThrow(); // return procedure.result;