Changeset 1360


Ignore:
Timestamp:
May 13, 2011, 12:59:55 PM (11 years ago)
Author:
Martin Svensson
Message:

Fixes #293 Remove workaround for for BASE ticket 1583 when 2.17.1 has been released

File:
1 edited

Legend:

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

    r1354 r1360  
    441441        Project pr = entry.getKey();
    442442        Permission p = entry.getValue();
    443         boolean isShared = false;
    444         try
    445         {
    446           if (pKey != null && pKey.getPermissions(pr).contains(p))
    447           {
    448             isShared = true;
    449           }
    450         }
    451         catch (NullPointerException ex)
    452         {} // Workaround due to a bug in BASE. See http://base.thep.lu.se/ticket/1583
    453         if (!isShared)
     443        if (pKey == null || !pKey.getPermissions(pr).contains(p))
    454444        {
    455445          message = "Not shared to project: " + pr.getName() + " (" + p + ")";
     
    463453        Permission p = entry.getValue();
    464454
    465         boolean isShared = false;
    466         try
    467         {
    468           if (key != null && key.getPermissions(g).contains(p))
    469           {
    470             isShared = true;
    471           }
    472         }
    473         catch (NullPointerException ex)
    474         {} // Workaround due to a bug in BASE. See http://base.thep.lu.se/ticket/1583
    475         if (!isShared)
     455        if (key == null || !key.getPermissions(g).contains(p))
    476456        {
    477457          message = "Not shared to group: " + g.getName() + " (" + p + ")";
Note: See TracChangeset for help on using the changeset viewer.