From 3ee9c263ca512068d2669cdf9a10679424eb6ce2 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Fri, 11 Apr 2014 16:58:25 +0200
Subject: ProxyLoader should return null when the object is not found on the
 server, not propagate the exception.

---
 src/main/java/com/c2kernel/persistency/ProxyLoader.java | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/main/java/com/c2kernel/persistency/ProxyLoader.java')

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());
-- 
cgit v1.2.3