/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 604

problem with passing the connection between objects

+        }
         // Check for READ permission on @docid for @user and/or @group
         AccessControlList aclobj = new AccessControlList(conn);
         boolean hasPermission = aclobj.hasPermission("READ",user,docid);
         AccessControlList aclobj = new AccessControlList();
         boolean hasPermission = aclobj.hasPermission(conn,"READ",user,docid);
         if ( !hasPermission && group != null ) {
           hasPermission = aclobj.hasPermission("READ",group,docid);
           hasPermission = aclobj.hasPermission(conn,"READ",group,docid);
+        }
         return hasPermission;

       /**
        * Construct an instance of the AccessControlList class.
        * It is used by the permission check up from DBQuery and DocumentImpl
        */
       public AccessControlList ()
+      {
        // this.conn = conn;
+      }
       /**
        * Construct an instance of the AccessControlList class.
        * It is used by the permission check up from DBQuery and DocumentImpl
+       *
        * @param conn the JDBC connection where acl data are loaded
        */
-...
+      }
       /** Check for @permission for @principal on @resourceId from db connection */
       public boolean hasPermission ( String permission, String principal,
                                      String resourceId )
       public boolean hasPermission ( Connection conn, String permission,
                                      String principal, String resourceId )
                      throws SQLException
+      {
         PreparedStatement pstmt;

Also available in: Unified diff