From 2ae60fa67dd0bdc3079a5ac6290fdf94ea14c3c0 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Tue, 26 Apr 2011 12:58:03 +0000
Subject: [PATCH] improving exception handling

SVN: 21041
---
 .../openbis/dss/client/api/v1/impl/DssComponent.java     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponent.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponent.java
index 0799ac20e2f..e70cfe87167 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponent.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponent.java
@@ -364,14 +364,15 @@ class AuthenticatedState extends AbstractDssComponentState
             EnvironmentFailureException, RemoteAccessException
     {
         // Contact openBIS to find out which DSS server manages the data set
-        String url =
-                getDataStoreUrlFromDataStore(service.tryGetDataStoreBaseURL(getSessionToken(),
-                        dataSetCode));
-        if (null == url)
+        String dataStoreBaseURL = service.tryGetDataStoreBaseURL(getSessionToken(),
+                dataSetCode);
+        if (null == dataStoreBaseURL)
         {
             throw new IllegalArgumentException("Could not retrieve data set with code "
                     + dataSetCode);
         }
+        String url =
+            getDataStoreUrlFromDataStore(dataStoreBaseURL);
 
         IDssServiceRpcGeneric dssService = getDssServiceForUrl(url);
         // Return a proxy to the data set
-- 
GitLab