ProxyLoader should return null when the object is not found on the

server, not propagate the exception.

1 files changed, 3 insertions, 0 deletions

diff --git a/src/main/java/com/c2kernel/persistency/ProxyLoader.java b/src/main/java/com/c2kernel/persistency/ProxyLoader.java
index a2f7141..4324e94 100644
--- a/src/main/java/com/c2kernel/persistency/ProxyLoader.java
+++ b/src/main/java/com/c2kernel/persistency/ProxyLoader.java
@@ -2,6 +2,7 @@ package com.c2kernel.persistency;
 import java.util.HashMap;

 import java.util.StringTokenizer;

 

+import com.c2kernel.common.ObjectNotFoundException;

 import com.c2kernel.entity.AgentHelper;

 import com.c2kernel.entity.C2KLocalObject;

 import com.c2kernel.entity.ItemHelper;

@@ -61,6 +62,8 @@ public class ProxyLoader extends ClusterStorage {
                 else

                     return (C2KLocalObject)Gateway.getMarshaller().unmarshall(queryData);

             }

+        } catch (ObjectNotFoundException e) {

+        	return null;

         } catch (Exception e) {

             Logger.error(e);

             throw new ClusterStorageException(e.getMessage());