[Exist-commits] eXist-1.0/src/org/exist/collections Collection.java,1.45,1.46

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

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

Modified Files:
	Collection.java 
Log Message:
Fixed some deadlocks introduced by yesterday's changes. Moved the global CollectionCache object in DBBroker to BrokerPool (it should not be declared
static or it will not be re-initialized upon database restart).

Index: Collection.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/collections/Collection.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** Collection.java	3 Aug 2004 16:45:46 -0000	1.45
--- Collection.java	4 Aug 2004 14:48:06 -0000	1.46
***************
*** 177,181 ****
  	 */
  	public void release() {
! //		LOG.debug("releasing lock on " + name);
  		lock.release();
  	}
--- 177,181 ----
  	 */
  	public void release() {
! 		LOG.debug("releasing lock on " + name);
  		lock.release();
  	}
***************
*** 292,296 ****
  			boolean recursive, boolean checkPermissions) {
  		if (permissions.validate(broker.getUser(), Permission.READ)) {
! 			CollectionCache cache = broker.getCollectionsCache();
  			synchronized (cache) {
  				getDocuments(broker, docs, checkPermissions);
--- 292,296 ----
  			boolean recursive, boolean checkPermissions) {
  		if (permissions.validate(broker.getUser(), Permission.READ)) {
! 			CollectionCache cache = broker.getBrokerPool().getCollectionsCache();
  			synchronized (cache) {
  				getDocuments(broker, docs, checkPermissions);