From 76b27ee73c189f1a474ce3810b4b1e72d4ca3059 Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Fri, 11 Feb 2011 18:28:42 +0000
Subject: [PATCH] fix: potential NPE
SVN: 19912
---
.../systemsx/cisd/openbis/generic/server/ETLService.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java
index 50dae27274a..766ea0e3660 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java
@@ -365,8 +365,9 @@ public class ETLService extends AbstractCommonServer<IETLService> implements IET
{
assert sessionToken != null : "Unspecified session token.";
assert samplePermID != null : "Unspecified sample perm ID.";
- return daoFactory.getSampleDAO().tryToFindByPermID(samplePermID).getSampleIdentifier();
- // FIXME null pointer exception
+
+ final SamplePE sample = daoFactory.getSampleDAO().tryToFindByPermID(samplePermID);
+ return (sample == null) ? null : sample.getSampleIdentifier();
}
private ExperimentPE tryLoadExperimentBySampleIdentifier(final Session session,
@@ -541,8 +542,6 @@ public class ETLService extends AbstractCommonServer<IETLService> implements IET
registerDataSet(sessionToken, experimentIdentifier, dataSet);
}
}
- // TODO Auto-generated method stub
-
}
public long registerExperiment(String sessionToken, NewExperiment experiment)
--
GitLab