Merge pull request #249 from SusanaFernandes/jerseyServices/FIST-350

Fix NPE when checking registration conclusion date FIST-350 #resolve
ist-dsi · Sep 20, 2016 · 32caac0 · 32caac0
2 parents 2c04ad2 + 54a22d8
commit 32caac0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/fenixedu-ist-integration/src/main/java/pt/ist/fenixedu/integration/api/JerseyServices.java b/fenixedu-ist-integration/src/main/java/pt/ist/fenixedu/integration/api/JerseyServices.java
@@ -386,7 +386,7 @@ public static String readAllStudentsInfoForJobBank() {
             }
         }
         for (ConclusionProcess conclusionProcess : Bennu.getInstance().getConclusionProcessesSet()) {
-            if (conclusionProcess.getConclusionDate() != null
+            if (conclusionProcess.getLastVersion() != null && conclusionProcess.getConclusionDate() != null
                     && !conclusionProcess.getConclusionDate().plusYears(1).isBefore(today)) {
                 registrations.add(conclusionProcess.getRegistration());
             }