[Mxquery-commit] SF.net SVN: mxquery:[4514] trunk/MXQuery/src/ch/ethz/mxquery/model

[<pm_...@us...>]

Revision: 4514
          http://mxquery.svn.sourceforge.net/mxquery/?rev=4514&view=rev
Author:   pm_fischer
Date:     2012-02-07 08:43:19 +0000 (Tue, 07 Feb 2012)
Log Message:
-----------
Resolved merge with upstream

Modified Paths:
--------------
    trunk/MXQuery/src/ch/ethz/mxquery/model/XDMIterator.java
    trunk/MXQuery/src/ch/ethz/mxquery/model/updatePrimitives/PendingUpdateList.java

Modified: trunk/MXQuery/src/ch/ethz/mxquery/model/XDMIterator.java
===================================================================
--- trunk/MXQuery/src/ch/ethz/mxquery/model/XDMIterator.java	2012-02-06 21:12:47 UTC (rev 4513)
+++ trunk/MXQuery/src/ch/ethz/mxquery/model/XDMIterator.java	2012-02-07 08:43:19 UTC (rev 4514)
@@ -217,4 +217,4 @@
 	 */
 	public abstract ObjectObjectPair getProjectionPaths() throws StaticException;
 
-}
\ No newline at end of file
+}

Modified: trunk/MXQuery/src/ch/ethz/mxquery/model/updatePrimitives/PendingUpdateList.java
===================================================================
--- trunk/MXQuery/src/ch/ethz/mxquery/model/updatePrimitives/PendingUpdateList.java	2012-02-06 21:12:47 UTC (rev 4513)
+++ trunk/MXQuery/src/ch/ethz/mxquery/model/updatePrimitives/PendingUpdateList.java	2012-02-07 08:43:19 UTC (rev 4514)
@@ -387,7 +387,11 @@
 					    throw new DynamicException(ErrorCodes.U0021_UPDATE_DYNAMIC_INVALID_XDM,"Duplicate attribute names in updates",null);
 					else
 					    seenAttrNames.add(attName);
-				    }  
+				    }
+				    } else {
+					if (seenAttrNames.size() > 0)
+					    seenAttrNames = new Set();
+				    }
 				    else {
 					if (seenAttrNames.size() > 0)
 					    seenAttrNames = new Set();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.