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

[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-serv25553/src/org/exist/collections

Modified Files:
	Collection.java 
Log Message:
XUpdate:

* Btree not correctly updated after node changes, leading to NullPointerException
* Attribute values truncated
* Page splitting error results in NullPointerException after a few hundred XUpdates
* New configuration parameter to control XUpdate behaviour

Other:

* Properties passed to Collection, XPathQueryService, XQueryService had no effect.
* Modified evaluation of index settings in conf.xml.

Index: Collection.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/collections/Collection.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Collection.java	3 May 2004 13:08:44 -0000	1.21
--- Collection.java	10 May 2004 11:22:37 -0000	1.22
***************
*** 1074,1078 ****
  			// first pass: parse the document to determine tree structure
  			LOG.debug("validating document " + name);
! 			streamer.serialize(node);
  			document.setMaxDepth(document.getMaxDepth() + 1);
  			document.calculateTreeLevelStartPoints();
--- 1074,1078 ----
  			// first pass: parse the document to determine tree structure
  			LOG.debug("validating document " + name);
! 			streamer.serialize(node, true);
  			document.setMaxDepth(document.getMaxDepth() + 1);
  			document.calculateTreeLevelStartPoints();
***************
*** 1098,1102 ****
  			// second pass: store the document
  			LOG.debug("storing document ...");
! 			streamer.serialize(node);
  	
  			try {
--- 1098,1102 ----
  			// second pass: store the document
  			LOG.debug("storing document ...");
! 			streamer.serialize(node, true);
  	
  			try {
***************
*** 1271,1275 ****
  				return new CollectionConfiguration(broker, this, doc);
  			} catch (CollectionConfigurationException e) {
! 				LOG.warn(e.getMessage(), e);
  			} finally {
  				triggersEnabled = true;
--- 1271,1275 ----
  				return new CollectionConfiguration(broker, this, doc);
  			} catch (CollectionConfigurationException e) {
! 				LOG.warn("Failed to load collection configuration " + e.getMessage());
  			} finally {
  				triggersEnabled = true;