Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Check whether roles is non-empty before adding to userAndRoles

Browse source
This commit is contained in:
Prasad Wagle 2016-02-25 15:22:51 -08:00
parent 733530f0fe
commit 52f4914688
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
View file

@ -114,9 +114,13 @@ public class NotebookServer extends WebSocketServlet implements
HashSet<String> userAndRoles = new HashSet<String>();
userAndRoles.add(messagereceived.principal);
HashSet<String> roles = gson.fromJson(messagereceived.roles,
new TypeToken<HashSet<String>>(){}.getType());
userAndRoles.addAll(roles);
if (!messagereceived.roles.equals("")) {
HashSet<String> roles = gson.fromJson(messagereceived.roles,
new TypeToken<HashSet<String>>(){}.getType());
if (roles != null) {
userAndRoles.addAll(roles);
}
}
/** Lets be elegant here */
switch (messagereceived.op) {