Merge pull request #693 from SusanaFernandes/fenixAPI/FIST-816

Avoid NPE when user has no photo FIST-816 #resolve
ist-dsi · Oct 17, 2019 · 95751d7 · 95751d7
2 parents 3387366 + 1c1ef39
commit 95751d7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/fenixedu-ist-integration/src/main/java/pt/ist/fenixedu/integration/api/FenixAPIv1.java b/fenixedu-ist-integration/src/main/java/pt/ist/fenixedu/integration/api/FenixAPIv1.java
@@ -180,8 +180,8 @@ private String mls(LocalizedString mls) {
 
     private FenixPhoto getPhoto(final Person person) {
         final String type = ContentType.PNG.getMimeType();
-        final byte[] avatar = person != null && person.isPhotoAvailableToCurrentUser() ?
-            person.getPersonalPhoto().getDefaultAvatar() : mysteryman();
+        final byte[] avatar = person != null && person.getPersonalPhoto() != null
+                && person.isPhotoAvailableToCurrentUser() ? person.getPersonalPhoto().getDefaultAvatar() : mysteryman();
         final String data = Base64.getEncoder().encodeToString(avatar);
         return new FenixPhoto(type, data);
     }