From 3b03e495339d16ea0abe606d1ef9199c839e9526 Mon Sep 17 00:00:00 2001
From: felmer <franz-josef.elmer@id.ethz.ch>
Date: Mon, 10 Apr 2023 07:00:30 +0200
Subject: [PATCH] Revert "SSDM-13458: add additional log statements in
tryGetPropertiesOfSample()"
This reverts commit 0f2f4bbef893ac1d28c82e8ab8b4a498365d57b9.
---
.../generic/server/ServiceForDataStoreServer.java | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceForDataStoreServer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceForDataStoreServer.java
index 1703f2848de..59750244076 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceForDataStoreServer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceForDataStoreServer.java
@@ -1003,26 +1003,21 @@ public class ServiceForDataStoreServer extends AbstractCommonServer<IServiceForD
{
assert sessionToken != null : "Unspecified session token.";
assert sampleIdentifier != null : "Unspecified sample identifier.";
- long t0 = System.currentTimeMillis();
+
final Session session = getSession(sessionToken);
final ISampleBO sampleBO = businessObjectFactory.createSampleBO(session);
sampleBO.loadBySampleIdentifier(sampleIdentifier);
- operationLog.info("TRY GET PROPERTIES OF SAMPLE: " + (System.currentTimeMillis()-t0)+" after loaded "+sampleIdentifier);
SamplePE sample = sampleBO.getSample();
if (sample == null)
{
return null;
}
Set<SamplePropertyPE> properties = sample.getProperties();
- operationLog.info("TRY GET PROPERTIES OF SAMPLE: " + (System.currentTimeMillis()-t0)+" after getProps of "+sampleIdentifier);
HibernateUtils.initialize(properties);
- operationLog.info("TRY GET PROPERTIES OF SAMPLE: " + (System.currentTimeMillis()-t0)+" after init props of "+sampleIdentifier);
- IEntityProperty[] result = EntityPropertyTranslator.translate(properties.toArray(new SamplePropertyPE[0]),
+ return EntityPropertyTranslator.translate(properties.toArray(new SamplePropertyPE[0]),
new HashMap<MaterialTypePE, MaterialType>(), new HashMap<PropertyTypePE, PropertyType>(),
managedPropertyEvaluatorFactory,
new SamplePropertyAccessValidator(session, getDAOFactory()));
- operationLog.info("TRY GET PROPERTIES OF SAMPLE: " + (System.currentTimeMillis()-t0)+" after translated props of "+sampleIdentifier);
- return result;
}
@Override
--
GitLab