X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=validation.git;a=blobdiff_plain;f=ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fakraino%2Fvalidation%2Fui%2Fservice%2FIntegratedResultService.java;fp=ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fakraino%2Fvalidation%2Fui%2Fservice%2FIntegratedResultService.java;h=555b948153f4ee31b515f885e60cabe7e8a55f36;hp=965a78cbbd4f2ee663eaa5d57182e9924898bb66;hb=f0359240d6f093f08eca0a077a37ab3b5b842765;hpb=5209bb26e2b70f6eefbccf61713dc2633751b86b

diff --git a/ui/src/main/java/org/akraino/validation/ui/service/IntegratedResultService.java b/ui/src/main/java/org/akraino/validation/ui/service/IntegratedResultService.java
index 965a78c..555b948 100644
--- a/ui/src/main/java/org/akraino/validation/ui/service/IntegratedResultService.java
+++ b/ui/src/main/java/org/akraino/validation/ui/service/IntegratedResultService.java
@@ -147,11 +147,11 @@ public class IntegratedResultService {
             throw new IllegalArgumentException("Could not retrieve lab : " + lab.toString());
         }
         ValidationDbTestResult vNexusResult = nexusService.getResult(name, version, labInfo.getSilo(), timestamp);
-        if (!dbAdapter.checkValidityOfNexusResult(vNexusResult)) {
-            return null;
+        if (vNexusResult != null && dbAdapter.checkValidityOfNexusResult(vNexusResult)) {
+            vNexusResult.setLab(labInfo);
+            return vNexusResult;
         }
-        vNexusResult.setLab(labInfo);
-        return vNexusResult;
+        return null;
     }
 
     public ValidationDbTestResult getLastResultBasedOnOutcomeFromNexus(@Nonnull String name, @Nonnull String version,
@@ -164,11 +164,11 @@ public class IntegratedResultService {
         }
         ValidationDbTestResult vNexusResult = nexusService.getLastResultBasedOnOutcome(name, version, labInfo.getSilo(),
                 allLayers, optional, outcome);
-        if (!dbAdapter.checkValidityOfNexusResult(vNexusResult)) {
-            return null;
+        if (vNexusResult != null && dbAdapter.checkValidityOfNexusResult(vNexusResult)) {
+            vNexusResult.setLab(labInfo);
+            return vNexusResult;
         }
-        vNexusResult.setLab(labInfo);
-        return vNexusResult;
+        return null;
     }
 
     public ValidationDbTestResult getLastResultBasedOnOutcomeFromNexus(@Nonnull String name, @Nonnull String version,
@@ -181,11 +181,11 @@ public class IntegratedResultService {
         }
         ValidationDbTestResult vNexusResult = nexusService.getLastResultBasedOnOutcome(name, version, labInfo.getSilo(),
                 layers, optional, outcome);
-        if (!dbAdapter.checkValidityOfNexusResult(vNexusResult)) {
-            return null;
+        if (vNexusResult != null && dbAdapter.checkValidityOfNexusResult(vNexusResult)) {
+            vNexusResult.setLab(labInfo);
+            return vNexusResult;
         }
-        vNexusResult.setLab(labInfo);
-        return vNexusResult;
+        return null;
     }
 
     public List<ValidationDbTestResult> getBasedOnDateFromNexus(@Nonnull String name, @Nonnull String version,