projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don’t try to get a null Sone.
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
web
/
SoneTemplatePage.java
diff --git
a/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
b/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
index
6afc3b7
..
a152d30
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
@@
-100,17
+100,20
@@
public class SoneTemplatePage extends TemplatePage {
/**
* Returns the currently logged in Sone.
*
/**
* Returns the currently logged in Sone.
*
- * @param toadletConte
n
xt
+ * @param toadletContext
* The toadlet context
* @return The currently logged in Sone, or {@code null} if no Sone is
* currently logged in
*/
* The toadlet context
* @return The currently logged in Sone, or {@code null} if no Sone is
* currently logged in
*/
- protected Sone getCurrentSone(ToadletContext toadletConte
n
xt) {
- Session session = getCurrentSession(toadletConte
n
xt);
+ protected Sone getCurrentSone(ToadletContext toadletContext) {
+ Session session = getCurrentSession(toadletContext);
if (session == null) {
return null;
}
String soneId = (String) session.getAttribute("Sone.CurrentSone");
if (session == null) {
return null;
}
String soneId = (String) session.getAttribute("Sone.CurrentSone");
+ if (soneId == null) {
+ return null;
+ }
for (Sone sone : webInterface.core().getSones()) {
if (sone.getId().equals(soneId)) {
return sone;
for (Sone sone : webInterface.core().getSones()) {
if (sone.getId().equals(soneId)) {
return sone;