X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.xml.sax.base%2Fsrc%2Forg%2Fsimantics%2Fxml%2Fsax%2Fbase%2FAbstractImporter.java;fp=org.simantics.xml.sax.base%2Fsrc%2Forg%2Fsimantics%2Fxml%2Fsax%2Fbase%2FAbstractImporter.java;h=34936318f3cec738e3fe8b58a7efac3bd3de8065;hb=20a9fae0ba905dc60889d87b57830caf79eeffc7;hp=f47dd9395c90e2338236fb0508ac9572a856327c;hpb=c8ead11dcd815dc26885b2b8e866e4ac4e563ae5;p=simantics%2Finterop.git diff --git a/org.simantics.xml.sax.base/src/org/simantics/xml/sax/base/AbstractImporter.java b/org.simantics.xml.sax.base/src/org/simantics/xml/sax/base/AbstractImporter.java index f47dd93..3493631 100644 --- a/org.simantics.xml.sax.base/src/org/simantics/xml/sax/base/AbstractImporter.java +++ b/org.simantics.xml.sax.base/src/org/simantics/xml/sax/base/AbstractImporter.java @@ -9,6 +9,7 @@ import org.simantics.db.common.request.DelayedWriteRequest; import org.simantics.db.common.request.WriteRequest; import org.simantics.db.exception.DatabaseException; import org.simantics.db.layer0.util.Layer0Utils; +import org.simantics.db.service.XSupport; import org.simantics.message.ILogger; import org.simantics.message.MessageService; @@ -21,7 +22,7 @@ public abstract class AbstractImporter { private ILogger logger; private XMLParser parser; - private static final boolean USE_DELAYED = false; + private static final boolean USE_DELAYED = true; public AbstractImporter(Session session, File file) { this.session = session; @@ -42,7 +43,10 @@ public abstract class AbstractImporter { if (USE_DELAYED) { ImportDelayedRequest req = new ImportDelayedRequest(); session.syncRequest(req); - return req.getResult(); + Resource dr = req.getResult(); + XSupport xs = session.getService(XSupport.class); + Resource result = xs.convertDelayedResourceToResource(dr); + return result; } else { ImportRequest req = new ImportRequest(); session.syncRequest(req);