From 6d9469d928b280dac7a0a579f3be0f6e33c552f5 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Mon, 4 Feb 2013 07:28:01 +0000
Subject: [PATCH] SP-491, BIS-255: Improve exception handling in
 FtpPathResolverContext.getExperiment()

SVN: 28263
---
 .../dss/generic/server/ftp/FtpPathResolverContext.java     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpPathResolverContext.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpPathResolverContext.java
index fc1a5c18913..dc66c88d11a 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpPathResolverContext.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpPathResolverContext.java
@@ -130,8 +130,11 @@ public class FtpPathResolverContext implements ISessionTokenProvider
                     service.listExperiments(sessionToken,
                             Collections.singletonList(experimentIdentifier),
                             new ExperimentFetchOptions());
-            experiment = result.isEmpty() ? null : result.get(0);
-            cache.putExperiment(experiment);
+            if (result.isEmpty())
+            {
+                throw new IllegalArgumentException("Unknown experiment " + experimentId);
+            }
+            cache.putExperiment(result.get(0));
         }
         return experiment;
     }
-- 
GitLab