Stop nullpointerexception if a missing resource was requested

1 files changed, 14 insertions, 9 deletions

diff --git a/src/main/java/com/c2kernel/persistency/XMLDBClusterStorage.java b/src/main/java/com/c2kernel/persistency/XMLDBClusterStorage.java
index 205876d..8521a17 100644
--- a/src/main/java/com/c2kernel/persistency/XMLDBClusterStorage.java
+++ b/src/main/java/com/c2kernel/persistency/XMLDBClusterStorage.java
@@ -152,15 +152,20 @@ public class XMLDBClusterStorage extends ClusterStorage {
 		if (itemColl == null) return null; // doesn't exist

 		

 		try {

-			String resource = path.replace('/', '.');

-			String objString = (String)itemColl.getResource(resource).getContent();

-			itemColl.close();

-			if (type.equals("Outcome"))

-                return new Outcome(path, objString);

-            else {

-                C2KLocalObject obj = (C2KLocalObject)Gateway.getMarshaller().unmarshall(objString);

-                return obj;

-            }

+			String resourceName = path.replace('/', '.');

+			Resource resource = itemColl.getResource(resourceName);

+			if (resource != null) {

+				String objString = (String)resource.getContent();

+				itemColl.close();

+				if (type.equals("Outcome"))

+					return new Outcome(path, objString);

+				else {

+					C2KLocalObject obj = (C2KLocalObject)Gateway.getMarshaller().unmarshall(objString);

+					return obj;

+				}

+			}

+			else

+				return null;

 		} catch (Exception e) {

 			Logger.error(e);

 			throw new ClusterStorageException("XMLDB error");