Sync git svn branch with SVN repository r33308.

[simantics/platform.git] / bundles / org.simantics.db.procore / src / fi / vtt / simantics / procore / internal / GraphSession.java

diff --git a/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/GraphSession.java b/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/GraphSession.java
index 054ee1d604e5ef8ddb6e0509cf043795a7612d90..4ba3722fcbba05d42be25404317872fe8947deb7 100644 (file)
--- a/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/GraphSession.java
+++ b/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/GraphSession.java
@@ -29,13 +29,13 @@ import org.simantics.databoard.binding.impl.TreeMapBinding;
 import org.simantics.databoard.serialization.Serializer;\r
 import org.simantics.db.ChangeSetIdentifier;\r
 import org.simantics.db.Database;\r
-import org.simantics.db.Operation;\r
-import org.simantics.db.SessionReference;\r
 import org.simantics.db.Database.Session.ChangeSetData;\r
 import org.simantics.db.Database.Session.ChangeSetIds;\r
 import org.simantics.db.Database.Session.ClusterChanges;\r
 import org.simantics.db.Database.Session.ClusterIds;\r
 import org.simantics.db.Database.Session.Refresh;\r
+import org.simantics.db.Operation;\r
+import org.simantics.db.SessionReference;\r
 import org.simantics.db.common.UndoContextEx;\r
 import org.simantics.db.common.utils.Logger;\r
 import org.simantics.db.exception.DatabaseException;\r
@@ -49,7 +49,6 @@ import org.simantics.scl.runtime.function.Function1;
 import org.simantics.scl.runtime.function.FunctionImpl1;\r
 import org.simantics.utils.threads.ThreadUtils;\r
 \r
-import fi.vtt.simantics.procore.ProCoreSessionReference;\r
 import gnu.trove.iterator.TLongObjectIterator;\r
 import gnu.trove.map.hash.THashMap;\r
 import gnu.trove.map.hash.TLongObjectHashMap;\r
@@ -519,7 +518,7 @@ public abstract class GraphSession {
             @Override\r
             public int read() throws IOException {\r
 \r
-                if(left <= 0) throw new IllegalStateException();\r
+                if(left <= 0) return -1;\r
 \r
                 if(offset == _s.bytes.length) {\r
                     short slen = (short)Math.min(left, IMAX);\r
@@ -725,6 +724,9 @@ public abstract class GraphSession {
             clusters[i] = new ClusterUID(first[i], second[i]);\r
         return clusters;\r
     }\r
+    public boolean rolledback() {\r
+        return dbSession.rolledback();\r
+    }\r
 }\r
 class BuiltinData {\r
     final long                  id;\r