[Exist-commits] eXist-1.0/src/org/exist/dom DocumentSet.java,1.16,1.17

[Wolfgang M. M. <wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist/dom
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15785/src/org/exist/dom

Modified Files:
	DocumentSet.java 
Log Message:
Fixed resource read/write permissions check.

Index: DocumentSet.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/dom/DocumentSet.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** DocumentSet.java	8 Jun 2004 08:16:08 -0000	1.16
--- DocumentSet.java	2 Jul 2004 16:53:57 -0000	1.17
***************
*** 108,120 ****
  	 * @param docs
  	 */
! 	public void addAll(DBBroker broker, java.util.Collection docs) {
  		DocumentImpl doc;
  		for(Iterator i = docs.iterator(); i.hasNext(); ) {
  			doc = (DocumentImpl)i.next();
- 			if(broker == null || doc.getPermissions().validate(broker.getUser(), Permission.READ)) {
  //			    if(doc.isLockedForWrite())
  //			        continue;
! 			    put(doc.getDocId(), doc);
! 			}
  		}
  	}
--- 108,121 ----
  	 * @param docs
  	 */
! 	public void addAll(DBBroker broker, java.util.Collection docs, boolean checkPermissions) {
  		DocumentImpl doc;
  		for(Iterator i = docs.iterator(); i.hasNext(); ) {
  			doc = (DocumentImpl)i.next();
  //			    if(doc.isLockedForWrite())
  //			        continue;
! 		    if(broker == null || !checkPermissions || 
! 		        doc.getPermissions().validate(broker.getUser(), Permission.READ)) {
! 		        put(doc.getDocId(), doc);
! 		    }
  		}
  	}