LMS-2587 bug fixed

SVN: 23394

openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiServer.java

@@ -151,9 +151,13 @@ public class QueryApiServer extends AbstractServer<IQueryApiServer> implements I
     public QueryTableModel createReportFromDataSets(String sessionToken, String dataStoreCode,
             String serviceKey, List<String> dataSetCodes)
     {
-        return translate(commonServer.createReportFromDatasets(sessionToken,
+        checkSession(sessionToken);
+
+        DatastoreServiceDescription description =
                 DatastoreServiceDescription.reporting(serviceKey, "", new String[0], dataStoreCode,
-                        null), dataSetCodes));
+                        null);
+        return translate(commonServer.createReportFromDatasets(sessionToken, description,
+                dataSetCodes));
     }
 
     public int getMajorVersion()

openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/Util.java

@@ -20,19 +20,24 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataTypeCode;
 import ch.systemsx.cisd.openbis.plugin.query.shared.api.v1.dto.QueryTableColumnDataType;
 
 /**
- * 
- *
  * @author Franz-Josef Elmer
  */
 class Util
 {
-    static QueryTableColumnDataType translate(DataTypeCode dataTypeCode)
+    static QueryTableColumnDataType translate(DataTypeCode dataTypeCodeOrNull)
     {
-        switch (dataTypeCode)
+        if (dataTypeCodeOrNull == null)
+        {
+            return QueryTableColumnDataType.STRING;
+        }
+        switch (dataTypeCodeOrNull)
         {
-            case INTEGER: return QueryTableColumnDataType.LONG;
-            case REAL: return QueryTableColumnDataType.DOUBLE;
-            default: return QueryTableColumnDataType.STRING;
+            case INTEGER:
+                return QueryTableColumnDataType.LONG;
+            case REAL:
+                return QueryTableColumnDataType.DOUBLE;
+            default:
+                return QueryTableColumnDataType.STRING;
         }
     }
 }