Acorn: Fix WriteRunnable.runReally() and other fixes

[simantics/platform.git] / bundles / org.simantics.acorn / src / org / simantics / acorn / lru / ClusterStreamChunk.java

diff --git a/bundles/org.simantics.acorn/src/org/simantics/acorn/lru/ClusterStreamChunk.java b/bundles/org.simantics.acorn/src/org/simantics/acorn/lru/ClusterStreamChunk.java
index 23cbfb1ce9cf2cbd1c8871e25dcc3216b2594aa0..57d6f6a04b5d387c2c0b31ca2fd6cafab845dd4c 100644 (file)
--- a/bundles/org.simantics.acorn/src/org/simantics/acorn/lru/ClusterStreamChunk.java
+++ b/bundles/org.simantics.acorn/src/org/simantics/acorn/lru/ClusterStreamChunk.java
@@ -7,6 +7,8 @@ import java.util.ArrayList;
 
 import org.simantics.acorn.ClusterManager;
 import org.simantics.acorn.Persistable;
+import org.simantics.acorn.exception.AcornAccessVerificationException;
+import org.simantics.acorn.exception.IllegalAcornStateException;
 import org.simantics.acorn.internal.ClusterChange;
 import org.simantics.acorn.internal.UndoClusterUpdateProcessor;
 import org.simantics.compressions.CompressionCodec;
@@ -31,14 +33,14 @@ public class ClusterStreamChunk extends LRUObject<String, ClusterStreamChunk> im
        public ArrayList<ClusterUpdateOperation> operations = new ArrayList<ClusterUpdateOperation>();
        
        // Stub
-       public ClusterStreamChunk(ClusterManager manager, LRU<String, ClusterStreamChunk> LRU, Path readDir, String id, int offset, int length) {
+       public ClusterStreamChunk(ClusterManager manager, LRU<String, ClusterStreamChunk> LRU, Path readDir, String id, int offset, int length) throws AcornAccessVerificationException {
                super(LRU, id, readDir, "clusterStream", offset, length, false, false);
                this.manager = manager;
                LRU.map(this);
        }
        
        // Creation
-       public ClusterStreamChunk(ClusterManager manager, LRU<String, ClusterStreamChunk> LRU, String id) {
+       public ClusterStreamChunk(ClusterManager manager, LRU<String, ClusterStreamChunk> LRU, String id) throws AcornAccessVerificationException {
                super(LRU, id, LRU.getDirectory(), "clusterStream", true, true);
                this.manager = manager;
                LRU.insert(this, accessTime);
@@ -51,8 +53,8 @@ public class ClusterStreamChunk extends LRUObject<String, ClusterStreamChunk> im
                makeResident(true);
 
                ClusterUpdateOperation op = operations.get(chunkOffset);
-               if(op == null) throw new IllegalStateException("Cluster Update Operation " + ccsId + " was not found.");
-               if(op.ccs == null) throw new IllegalStateException("Cluster ChangeSet " + ccsId + " was not found.");
+               if(op == null) throw new IllegalAcornStateException("Cluster Update Operation " + ccsId + " was not found.");
+               if(op.ccs == null) throw new IllegalAcornStateException("Cluster ChangeSet " + ccsId + " was not found.");
 
                UndoClusterUpdateProcessor proc = new UndoClusterUpdateProcessor(clusters, this, op.ccs);
                if(proc.version != ClusterChange.VERSION)
@@ -69,9 +71,9 @@ public class ClusterStreamChunk extends LRUObject<String, ClusterStreamChunk> im
                
        }
        
-       public void addOperation(ClusterUpdateOperation op) {
+       public void addOperation(ClusterUpdateOperation op) throws IllegalAcornStateException {
                if(committed)
-                       throw new IllegalStateException();
+                       throw new IllegalAcornStateException("Cannot add operation " + op + " to " + this + " if commited == true");
                operations.add(op);
                size += op.data.length;
 //             if(isCommitted()) {
@@ -93,7 +95,7 @@ public class ClusterStreamChunk extends LRUObject<String, ClusterStreamChunk> im
        }
        
        @Override
-       public boolean canBePersisted() {
+       public boolean canBePersisted() throws AcornAccessVerificationException {
                if(!super.canBePersisted()) return false;
                if(!isCommitted()) return false;
                for(ClusterUpdateOperation op : operations) {
@@ -213,7 +215,7 @@ public class ClusterStreamChunk extends LRUObject<String, ClusterStreamChunk> im
        private static StreamDecompressor decompressor = new StreamDecompressor();
        
        @Override
-       public void fromFile(byte[] data_) {
+       public void fromFile(byte[] data_) throws IllegalAcornStateException, AcornAccessVerificationException {
 
                try {
                        
@@ -271,17 +273,13 @@ public class ClusterStreamChunk extends LRUObject<String, ClusterStreamChunk> im
                                        }
 
                                }
-                               
                                operations.add(op);
-                               
                        }
-                       
                } catch (IOException e) {
-                       
-                       throw new IllegalStateException(e);
-                       
-               }
-               
+                       throw new IllegalAcornStateException(e);
+               } catch (IllegalAcornStateException | AcornAccessVerificationException e) {
+            throw e;
+        }
        }
 
        @Override