merge rc

Author: EleonoraPetzold

BExIS++.lutconfig

@@ -0,0 +1,6 @@
+<LUTConfig Version="1.0">
+  <Repository />
+  <ParallelBuilds>true</ParallelBuilds>
+  <ParallelTestRuns>true</ParallelTestRuns>
+  <TestCaseTimeout>180000</TestCaseTimeout>
+</LUTConfig>

Components/DLM/BExIS.Dlm.Entities/Data/VariableValue.cs

@@ -61,7 +61,7 @@ public VariableInstance Variable
         {
             get
             {
-                if (this.Tuple.DatasetVersion.Dataset.DataStructure.Self is StructuredDataStructure)
+                if (this.Tuple.DatasetVersion.Dataset.DataStructure != null)
                 {
                     VariableInstance u = (this.Tuple.DatasetVersion.Dataset.DataStructure.Self as StructuredDataStructure).Variables
                         .Where(p => p.Id.Equals(this.VariableId))

Components/DLM/BExIS.Dlm.Services/Data/DatasetManager.cs

@@ -1254,7 +1254,7 @@ public DataTable GetLatestDatasetVersionTuples(long datasetId, int pageNumber, i
                 // should use the fallback method, but DatasetConvertor class must be merged with OutputDataManager and SearchUIHelper claases first.
                 var version = this.GetDatasetLatestVersion(datasetId);
                 var tuples = getDatasetVersionEffectiveTuples(version, pageNumber, pageSize, false); // the false, causes the method to use a scoped sesssion and keep it alive further processings that aredone later on the tuples
-                if (version.Dataset.DataStructure.Self is StructuredDataStructure)
+                if (version.Dataset.DataStructure!=null)
                 {
                     DataTable table = convertDataTuplesToDataTable(tuples, version, (StructuredDataStructure)version.Dataset.DataStructure.Self);
                     return table;
@@ -1268,7 +1268,7 @@ public DataTable GetDatasetVersionTuples(long versionId, int pageNumber, int pag
             // should use the fallback method, but DatasetConvertor class must be merged with OutputDataManager and SearchUIHelper claases first.
             var version = this.GetDatasetVersion(versionId);
             var tuples = getDatasetVersionEffectiveTuples(version, pageNumber, pageSize, false); // the false, causes the method to use a scoped sesssion and keep it alive further processings that aredone later on the tuples
-            if (version.Dataset.DataStructure.Self is StructuredDataStructure)
+            if (version.Dataset.DataStructure != null)
             {
                 DataTable table = convertDataTuplesToDataTable(tuples, version, (StructuredDataStructure)version.Dataset.DataStructure.Self);
                 return table;
@@ -3361,7 +3361,7 @@ private void createMaterializedView(long datasetId)
             {
                 var datasetRepo = uow.GetReadOnlyRepository<Dataset>();
                 Dataset ds = datasetRepo.Get(datasetId);
-                if (ds.DataStructure != null && ds.DataStructure.Self is StructuredDataStructure)
+                if (ds.DataStructure != null && ds.DataStructure!= null)
                 {
                     StructuredDataStructure sds = (StructuredDataStructure)ds.DataStructure.Self;
                     if (sds.Variables != null && sds.Variables.Count() > 0)