fix: infinite recursion (leading to an StackOverflowException) when exporting...

fix: infinite recursion (leading to an StackOverflowException) when exporting data sets with data set properties
(merged from Sprint branch S64.x, r12670)

SVN: 12671

openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataSetTypePropertyTypeTranslator.java

@@ -60,10 +60,11 @@ public class DataSetTypePropertyTypeTranslator
     }
 
     public static List<DataSetTypePropertyType> translate(
-            Set<DataSetTypePropertyTypePE> DataSetTypePropertyTypes, PropertyType result)
+            Set<DataSetTypePropertyTypePE> DataSetTypePropertyTypes, PropertyType result,
+            Map<PropertyTypePE, PropertyType> cacheOrNull)
     {
         return new DataSetTypePropertyTypeTranslatorHelper().translate(DataSetTypePropertyTypes,
-                result, null);
+                result, cacheOrNull);
     }
 
     public static DataSetTypePropertyType translate(DataSetTypePropertyTypePE entityTypePropertyType)

openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/PropertyTypeTranslator.java

@@ -83,7 +83,7 @@ public final class PropertyTypeTranslator
         result.setExperimentTypePropertyTypes(ExperimentTypePropertyTypeTranslator.translate(
                 propertyType.getExperimentTypePropertyTypes(), result));
         result.setDataSetTypePropertyTypes(DataSetTypePropertyTypeTranslator.translate(propertyType
-                .getDataSetTypePropertyTypes(), result));
+                .getDataSetTypePropertyTypes(), result, cacheOrNull));
         return result;
     }