Changeset 1312

Timestamp:

Mar 7, 2011, 9:00:46 AM (11 years ago)

Author:

Nicklas Nordborg

Message:

References #292: Check/create annotation types, etc. required by reggie

Workaround for ​http://base.thep.lu.se/ticket/1583

File:

• extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/InstallServlet.java (modified) (2 diffs)

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/InstallServlet.java

@@ -433 +433 @@
         Project pr = entry.getKey();
         Permission p = entry.getValue();
-        if (pKey == null || !pKey.getPermissions(pr).contains(p)) 
+        boolean isShared = false;
+        try
+        {
+          if (pKey != null && pKey.getPermissions(pr).contains(p))
+          {
+            isShared = true;
+          }
+        }
+        catch (NullPointerException ex)
+        {} // Workaround due to a bug in BASE. See http://base.thep.lu.se/ticket/1583
+        if (!isShared) 
         {
           message = "Not shared to project: " + pr.getName() + " (" + p + ")";
@@ -444 +454 @@
         Group g = entry.getKey();
         Permission p = entry.getValue();
-        
-        if (key == null || !key.getPermissions(g).contains(p)) 
+
+        boolean isShared = false;
+        try
+        {
+          if (key != null && key.getPermissions(g).contains(p))
+          {
+            isShared = true;
+          }
+        }
+        catch (NullPointerException ex)
+        {} // Workaround due to a bug in BASE. See http://base.thep.lu.se/ticket/1583
+        if (!isShared) 
         {
           message = "Not shared to group: " + g.getName() + " (" + p + ")";