LMS-547 authorization for datasets: check for tryGetDataSet

SVN: 7969

dataset_download/source/java/ch/systemsx/cisd/openbis/datasetdownload/DataSetService.java

@@ -41,10 +41,10 @@ final class DataSetService implements IDataSetService
     // IDataSetService
     //
 
-    public final ExternalData getDataSet(final String sessionToken, final String dataSetCode)
+    public final ExternalData tryGetDataSet(final String sessionToken, final String dataSetCode)
             throws UserFailureException
     {
-        return service.getDataSet(sessionToken, dataSetCode);
+        return service.tryGetDataSet(sessionToken, dataSetCode);
     }
 
     public final String authenticate(final String user, final String password)

dataset_download/source/java/ch/systemsx/cisd/openbis/datasetdownload/DatasetDownloadServlet.java

@@ -391,15 +391,20 @@ public class DatasetDownloadServlet extends HttpServlet
         if (sessionIdOrNull != null)
         {
             IDataSetService dataSetService = applicationContext.getDataSetService();
-            ExternalData dataSet = dataSetService.getDataSet(sessionIdOrNull, dataSetCode);
+            ExternalData dataSet = dataSetService.tryGetDataSet(sessionIdOrNull, dataSetCode);
             if (operationLog.isInfoEnabled())
             {
-                operationLog.info("Data set '" + dataSetCode + "' obtained from openBIS server.");
+                String actionDesc = (dataSet != null) ? "obtained from" : "not found in";
+                operationLog.info(String.format("Data set '%s' %s openBIS server.", dataSetCode,
+                        actionDesc));
             }
             HttpSession session = request.getSession(true);
             ConfigParameters configParameters = applicationContext.getConfigParameters();
             session.setMaxInactiveInterval(configParameters.getSessionTimeout());
-            putDataSetToMap(session, dataSetCode, dataSet);
+            if (dataSet != null)
+            {
+                putDataSetToMap(session, dataSetCode, dataSet);
+            }
         }
     }
 

dataset_download/sourceTest/java/ch/systemsx/cisd/openbis/datasetdownload/DatasetDownloadServletTest.java

@@ -495,7 +495,7 @@ public class DatasetDownloadServletTest
         context.checking(new Expectations()
             {
                 {
-                    one(dataSetService).getDataSet(EXAMPLE_SESSION_ID, EXAMPLE_DATA_SET_CODE);
+                    one(dataSetService).tryGetDataSet(EXAMPLE_SESSION_ID, EXAMPLE_DATA_SET_CODE);
                     will(returnValue(externalData));
 
                     one(request).getSession(true);