projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release-0.4'
[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
c4eac6c
..
0cb92ff
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
+++ b/
src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
@@
-21,6
+21,7
@@
import net.pterodactylus.sone.core.Core;
import net.pterodactylus.sone.core.Core.SoneStatus;
import net.pterodactylus.sone.data.Profile;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.core.Core.SoneStatus;
import net.pterodactylus.sone.data.Profile;
import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.freenet.wot.Trust;
import net.pterodactylus.util.template.Accessor;
import net.pterodactylus.util.template.DataProvider;
import net.pterodactylus.util.template.ReflectionAccessor;
import net.pterodactylus.util.template.Accessor;
import net.pterodactylus.util.template.DataProvider;
import net.pterodactylus.util.template.ReflectionAccessor;
@@
-91,7
+92,10
@@
public class SoneAccessor extends ReflectionAccessor {
return core.isLocked(sone);
} else if (member.equals("trust")) {
Sone currentSone = (Sone) dataProvider.getData("currentSone");
return core.isLocked(sone);
} else if (member.equals("trust")) {
Sone currentSone = (Sone) dataProvider.getData("currentSone");
- return core.getTrust(currentSone, sone);
+ Trust trust = core.getTrust(currentSone, sone);
+ if (trust == null) {
+ return new Trust(null, null, null);
+ }
}
return super.get(dataProvider, object, member);
}
}
return super.get(dataProvider, object, member);
}