Changeset 1312


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/InstallServlet.java

    r1310 r1312  
    433433        Project pr = entry.getKey();
    434434        Permission p = entry.getValue();
    435         if (pKey == null || !pKey.getPermissions(pr).contains(p))
     435        boolean isShared = false;
     436        try
     437        {
     438          if (pKey != null && pKey.getPermissions(pr).contains(p))
     439          {
     440            isShared = true;
     441          }
     442        }
     443        catch (NullPointerException ex)
     444        {} // Workaround due to a bug in BASE. See http://base.thep.lu.se/ticket/1583
     445        if (!isShared)
    436446        {
    437447          message = "Not shared to project: " + pr.getName() + " (" + p + ")";
     
    444454        Group g = entry.getKey();
    445455        Permission p = entry.getValue();
    446        
    447         if (key == null || !key.getPermissions(g).contains(p))
     456
     457        boolean isShared = false;
     458        try
     459        {
     460          if (key != null && key.getPermissions(g).contains(p))
     461          {
     462            isShared = true;
     463          }
     464        }
     465        catch (NullPointerException ex)
     466        {} // Workaround due to a bug in BASE. See http://base.thep.lu.se/ticket/1583
     467        if (!isShared)
    448468        {
    449469          message = "Not shared to group: " + g.getName() + " (" + p + ")";
Note: See TracChangeset for help on using the changeset viewer.