[cvs] expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj RowSecuredDBObject.java

[JCorporate Ltd]

Update of /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj
In directory jcorp2.servlets.net:/tmp/cvs-serv18785/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj

Modified Files:
	RowSecuredDBObject.java 
Log Message:
make Admin detection a bit more efficient


Index: RowSecuredDBObject.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/RowSecuredDBObject.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** RowSecuredDBObject.java	2 May 2004 23:03:25 -0000	1.23
--- RowSecuredDBObject.java	7 May 2004 08:46:03 -0000	1.24
***************
*** 521,532 ****
          user.setDataContext(this.getDataContext());
  
          if (!user.find()) {
              throw new DBException("cannot find requesting user.");
          }
  
-         if (user.getLoginName().equals(User.ADMIN_USER)) {
-             return true;
-         }
- 
          RowPermissions rowPermissions = this.getPermissions();
  
--- 521,530 ----
          user.setDataContext(this.getDataContext());
  
+         if (user.isAdmin()) return true;
+ 
          if (!user.find()) {
              throw new DBException("cannot find requesting user.");
          }
  
          RowPermissions rowPermissions = this.getPermissions();
  
***************
*** 569,580 ****
          user.setDataContext(this.getDataContext());
  
          if (!user.find()) {
              throw new DBException("cannot find requesting user.");
          }
  
-         if (user.isAdmin()) {
-             return true;
-         }
- 
          RowPermissions rowPermissions = this.getPermissions();
  
--- 567,576 ----
          user.setDataContext(this.getDataContext());
  
+         if (user.isAdmin()) return true;
+ 
          if (!user.find()) {
              throw new DBException("cannot find requesting user.");
          }
  
          RowPermissions rowPermissions = this.getPermissions();
  
***************
*** 619,628 ****
          user.setDataContext(this.getDataContext());
  
          if (!user.find()) {
              throw new DBException("cannot find requesting user.");
-         }
- 
-         if (user.getLoginName().equals(User.ADMIN_USER)) {
-             return true;
          }
  
--- 615,622 ----
          user.setDataContext(this.getDataContext());
  
+         if (user.isAdmin()) return true;
+ 
          if (!user.find()) {
              throw new DBException("cannot find requesting user.");
          }