From 577c7b884783c1c055a4da3663d1f55a2109b442 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Wed, 21 Dec 2011 13:41:27 +0100 Subject: [PATCH] Exit accessor earlier if avatar ID is null. --- .../net/pterodactylus/sone/template/ProfileAccessor.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) 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) { -- 2.7.4