RemoteMap bugfix

2 files changed, 5 insertions, 9 deletions

diff --git a/source/com/c2kernel/events/History.java b/source/com/c2kernel/events/History.java
index a964a72..868eaea 100644
--- a/source/com/c2kernel/events/History.java
+++ b/source/com/c2kernel/events/History.java
@@ -68,14 +68,9 @@ public class History extends RemoteMap<Event> {
         synchronized (this) {

             int newEventID = getLastId()+1;

             newEvent.setID(newEventID);

-            if (put(newEvent.getName(), newEvent) != null) {

-                lastID = newEventID;

-                return newEvent;

-            }

-            else {

-                Logger.error("History.addEvent() - Event storage failed!");

-                return null;

-            }

+            put(newEvent.getName(), newEvent);

+            lastID = newEventID;

+            return newEvent;

         }

     }

 

diff --git a/source/com/c2kernel/persistency/RemoteMap.java b/source/com/c2kernel/persistency/RemoteMap.java
index bc17e3f..2147047 100644
--- a/source/com/c2kernel/persistency/RemoteMap.java
+++ b/source/com/c2kernel/persistency/RemoteMap.java
@@ -114,6 +114,7 @@ public class RemoteMap<V extends C2KLocalObject> extends TreeMap<String, V> impl
 

     public synchronized int getLastId() {

     	loadKeys();

+    	if (size() == 0) return -1;

     	try {

     		return Integer.parseInt(lastKey());

     	} catch (NumberFormatException ex) {

@@ -238,7 +239,7 @@ public class RemoteMap<V extends C2KLocalObject> extends TreeMap<String, V> impl
 		try {

             synchronized(this) {

                 storage.put(mSysKey, value, mLocker);

-			    return putLocal(key, value);

+                return putLocal(key, value);

             }

 		} catch (ClusterStorageException e) {

 			Logger.error(e);