Return “null” for Sones without a name.

[Sone.git] / src / main / java / net / pterodactylus / sone / template / SoneAccessor.java

diff --git a/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java b/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
index 5b787a9..a21794d 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
+++ b/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
@@ -76,7 +76,7 @@ public class SoneAccessor extends ReflectionAccessor {
                } else if (member.equals("modified")) {
                        return sone.getModificationCounter() > 0;
                } else if (member.equals("status")) {
-                       return core.getSoneStatus(sone).toString();
+                       return core.getSoneStatus(sone);
                } else if (member.equals("unknown")) {
                        return core.getSoneStatus(sone) == SoneStatus.unknown;
                } else if (member.equals("idle")) {
@@ -107,7 +107,7 @@ public class SoneAccessor extends ReflectionAccessor {
                String lastName = profile.getLastName();
                if (firstName == null) {
                        if (lastName == null) {
-                               return sone.getName();
+                               return String.valueOf(sone.getName());
                        }
                        return lastName;
                }