X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.acorn%2Fsrc%2Forg%2Fsimantics%2Facorn%2Flru%2FChangeSetInfo.java;h=e1915d32b771aba4e7e1f5109f6be07d83d6b948;hp=12351a5194c3b07a17845cf8cb7a06f8d8fb6dd2;hb=1dfeb7d5c49b1391cd9d877e1eddab18995cb151;hpb=65cf12eb906873cf56c10bd1f8d04ec8645e6cbd

diff --git a/bundles/org.simantics.acorn/src/org/simantics/acorn/lru/ChangeSetInfo.java b/bundles/org.simantics.acorn/src/org/simantics/acorn/lru/ChangeSetInfo.java
index 12351a519..e1915d32b 100644
--- a/bundles/org.simantics.acorn/src/org/simantics/acorn/lru/ChangeSetInfo.java
+++ b/bundles/org.simantics.acorn/src/org/simantics/acorn/lru/ChangeSetInfo.java
@@ -4,24 +4,29 @@ import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 
+import org.simantics.acorn.exception.AcornAccessVerificationException;
+import org.simantics.acorn.exception.IllegalAcornStateException;
 import org.simantics.db.service.Bytes;
 import org.simantics.utils.datastructures.Pair;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import gnu.trove.list.array.TByteArrayList;
 
 public class ChangeSetInfo extends LRUObject<Long, ChangeSetInfo> {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(ChangeSetInfo.class);
 	private byte[] metadataBytes;
 	private ArrayList<String> clusterChangeSetIds;
 	
 	// Stub
-	public ChangeSetInfo(LRU<Long, ChangeSetInfo> LRU, Path readDir, Long revision, int offset, int length) {
+	public ChangeSetInfo(LRU<Long, ChangeSetInfo> LRU, Path readDir, Long revision, int offset, int length) throws AcornAccessVerificationException {
 		super(LRU, revision, readDir, "clusterStream", offset, length, false, false);
 		LRU.map(this);
 	}
 	
 	// New
-	public ChangeSetInfo(LRU<Long, ChangeSetInfo> LRU, Long revision, byte[] bytes, ArrayList<String> clusterChangeSetIds) {
+	public ChangeSetInfo(LRU<Long, ChangeSetInfo> LRU, Long revision, byte[] bytes, ArrayList<String> clusterChangeSetIds) throws AcornAccessVerificationException {
 		super(LRU, revision, LRU.getDirectory(), "clusterStream", true, true);
 		this.metadataBytes = bytes;
 		this.metadataBytes = bytes;
@@ -29,19 +34,17 @@ public class ChangeSetInfo extends LRUObject<Long, ChangeSetInfo> {
 		LRU.insert(this, accessTime);
 	}
 	
-	public ArrayList<String> getCSSIds() {
+	public ArrayList<String> getCCSIds() throws AcornAccessVerificationException {
 		if(VERIFY) verifyAccess();
 		return clusterChangeSetIds;
 	}
 	
-	public byte[] getMetadataBytes() {
-		
-		if(VERIFY) verifyAccess();
+	public byte[] getMetadataBytes() throws AcornAccessVerificationException, IllegalAcornStateException {
+		if(VERIFY)
+		    verifyAccess();
 		
 		makeResident();
-		
 		return metadataBytes;
-		
 	}
 	
 	private static void writeLE(TByteArrayList bytes, int value) {
@@ -110,4 +113,8 @@ public class ChangeSetInfo extends LRUObject<Long, ChangeSetInfo> {
 		return false;
 	}
 
+	@Override
+	public Logger getLogger() {
+	    return LOGGER;
+	}
 }
\ No newline at end of file