From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Wed, 21 Dec 2011 12:41:27 +0000 (+0100)
Subject: Exit accessor earlier if avatar ID is null.
X-Git-Tag: 0.8^2~39
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=577c7b884783c1c055a4da3663d1f55a2109b442;p=Sone.git

Exit accessor earlier if avatar ID is null.
---

diff --git a/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java b/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java
index 05857cf..366e071 100644
--- a/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java
+++ b/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java
@@ -61,11 +61,12 @@ public class ProfileAccessor extends ReflectionAccessor {
 				return null;
 			}
 			String avatarId = profile.getAvatar();
-			if (avatarId != null) {
-				if (core.getImage(avatarId, false) == null) {
-					/* avatar ID but no matching image? show nothing. */
-					return null;
-				}
+			if (avatarId == null) {
+				return null;
+			}
+			if (core.getImage(avatarId, false) == null) {
+				/* avatar ID but no matching image? show nothing. */
+				return null;
 			}
 			Sone remoteSone = profile.getSone();
 			if (core.isLocalSone(remoteSone)) {
@@ -76,7 +77,7 @@ public class ProfileAccessor extends ReflectionAccessor {
 			if (showCustomAvatars == ShowCustomAvatars.NEVER) {
 				return null;
 			}
-			if ((showCustomAvatars == ShowCustomAvatars.ALWAYS) || (avatarId == null)) {
+			if (showCustomAvatars == ShowCustomAvatars.ALWAYS) {
 				return avatarId;
 			}
 			if (showCustomAvatars == ShowCustomAvatars.FOLLOWED) {