[Exist-commits] eXist-1.0/src/org/exist/storage NativeBroker.java,1.60,1.61

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

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

Modified Files:
	NativeBroker.java 
Log Message:
* Fixed stability issues: collection pointers got corrupted occasionally,
resulting in ArrayIndexOutOfBoundsExceptions.

* Added check for file format versions: the database will throw an
exception if the database files are incompatible with the current
eXist version.

Index: NativeBroker.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/storage/NativeBroker.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** NativeBroker.java	25 Mar 2004 12:50:50 -0000	1.60
--- NativeBroker.java	29 Mar 2004 14:15:14 -0000	1.61
***************
*** 243,249 ****
  			user = new User("admin", null, "dba");
  			getOrCreateCollection(ROOT_COLLECTION);
! 		} catch (Exception e) {
! 			LOG.debug(e);
! 			e.printStackTrace();
  		}
  	}
--- 243,252 ----
  			user = new User("admin", null, "dba");
  			getOrCreateCollection(ROOT_COLLECTION);
! 		} catch (DBException e) {
! 			LOG.debug("failed to initialize database: " + e.getMessage(), e);
! 			throw new EXistException(e);
! 		} catch (PermissionDeniedException e) {
! 			LOG.debug("failed to initialize database: " + e.getMessage(), e);
! 			throw new EXistException(e);
  		}
  	}
***************
*** 1679,1687 ****
  			}
  			collection.setAddress(address);
! 			if (!name.equals(ROOT_COLLECTION)) {
! 				Collection parent = collection.getParent(this);
! 				parent.update(collection);
! 				saveCollection(parent);
! 			}
  			ostream.close();
  		} catch (IOException ioe) {
--- 1682,1690 ----
  			}
  			collection.setAddress(address);
! //			if (!name.equals(ROOT_COLLECTION)) {
! //				Collection parent = collection.getParent(this);
! //				parent.update(collection);
! //				saveCollection(parent);
! //			}
  			ostream.close();
  		} catch (IOException ioe) {
***************
*** 1724,1732 ****
  				}
  				collection.setAddress(addr);
! 				if (!name.equals(ROOT_COLLECTION)) {
! 					Collection parent = collection.getParent(this);
! 					parent.update(collection);
! 					saveCollection(parent);
! 				}
  				collectionsDb.getCollectionCache().add(collection);
  				ostream.close();
--- 1727,1735 ----
  				}
  				collection.setAddress(addr);
! //				if (!name.equals(ROOT_COLLECTION)) {
! //					Collection parent = collection.getParent(this);
! //					parent.update(collection);
! //					saveCollection(parent);
! //				}
  				collectionsDb.getCollectionCache().add(collection);
  				ostream.close();