Changeset 5581

Timestamp:

Mar 8, 2011, 9:39:41 AM (12 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1583: NullPointerException? in ProjectKey?.getPermissions(Project) and ItemKey?.getPermissions(Group/User?)

Location:

branches/2.17-stable/src/core/net/sf/basedb/core

Files:

• ItemKey.java (modified) (2 diffs)
• ProjectKey.java (modified) (1 diff)

branches/2.17-stable/src/core/net/sf/basedb/core/ItemKey.java

@@ -304 +304 @@
   {
     if (user == null) throw new InvalidUseOfNullException("user");
-    return Permission.fromInt(getData().getUsers().get(user.getData()));
+    return Permission.fromInt(IntegerUtil.getInt(getData().getUsers().get(user.getData())));
   }
 
@@ -319 +319 @@
   {
     if (group == null) throw new InvalidUseOfNullException("group");
-    return Permission.fromInt(getData().getGroups().get(group.getData()));
+    return Permission.fromInt(IntegerUtil.getInt(getData().getGroups().get(group.getData())));
   }
 

branches/2.17-stable/src/core/net/sf/basedb/core/ProjectKey.java

@@ -273 +273 @@
   {
     if (project == null) throw new InvalidUseOfNullException("project");
-    return Permission.fromInt(getData().getProjects().get(project.getData()));
+    return Permission.fromInt(IntegerUtil.getInt(getData().getProjects().get(project.getData())));
   }