From 275d0bbf555c8917be82ce4cc21eb4cabb00f4c5 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Fri, 3 Oct 2014 17:30:41 +0200 Subject: Huge exception overhaul: Merged ClusterStorageException with PersistencyException. Replaced MembershipException with InvalidCollectionModification CORBA Exception. Made all predef steps throw more accurate exceptions when they go wrong, and let more exceptions bubble through from underneath. --- .../com/c2kernel/persistency/MemoryOnlyClusterStorage.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/main/java/com/c2kernel/persistency/MemoryOnlyClusterStorage.java') diff --git a/src/main/java/com/c2kernel/persistency/MemoryOnlyClusterStorage.java b/src/main/java/com/c2kernel/persistency/MemoryOnlyClusterStorage.java index 5717d85..7408da3 100644 --- a/src/main/java/com/c2kernel/persistency/MemoryOnlyClusterStorage.java +++ b/src/main/java/com/c2kernel/persistency/MemoryOnlyClusterStorage.java @@ -25,6 +25,7 @@ import java.util.ConcurrentModificationException; import java.util.HashMap; import java.util.Map; +import com.c2kernel.common.PersistencyException; import com.c2kernel.entity.C2KLocalObject; import com.c2kernel.lookup.ItemPath; import com.c2kernel.process.auth.Authenticator; @@ -41,12 +42,12 @@ public class MemoryOnlyClusterStorage extends ClusterStorage { } @Override - public void open(Authenticator auth) throws ClusterStorageException { + public void open(Authenticator auth) throws PersistencyException { } @Override - public void close() throws ClusterStorageException { + public void close() throws PersistencyException { } @Override @@ -66,7 +67,7 @@ public class MemoryOnlyClusterStorage extends ClusterStorage { @Override public C2KLocalObject get(ItemPath thisItem, String path) - throws ClusterStorageException { + throws PersistencyException { Map sysKeyMemCache = memoryCache.get(thisItem); if (sysKeyMemCache != null) return sysKeyMemCache.get(path); @@ -75,7 +76,7 @@ public class MemoryOnlyClusterStorage extends ClusterStorage { @Override public void put(ItemPath thisItem, C2KLocalObject obj) - throws ClusterStorageException { + throws PersistencyException { // create item cache if not present Map sysKeyMemCache; @@ -98,7 +99,7 @@ public class MemoryOnlyClusterStorage extends ClusterStorage { @Override public void delete(ItemPath thisItem, String path) - throws ClusterStorageException { + throws PersistencyException { Map sysKeyMemCache = memoryCache.get(thisItem); if (sysKeyMemCache != null) { synchronized (sysKeyMemCache) { @@ -116,7 +117,7 @@ public class MemoryOnlyClusterStorage extends ClusterStorage { @Override public String[] getClusterContents(ItemPath thisItem, String path) - throws ClusterStorageException { + throws PersistencyException { Map sysKeyMemCache = memoryCache.get(thisItem); ArrayList result = new ArrayList(); if (sysKeyMemCache != null) { -- cgit v1.2.3