[Exist-commits] SF.net SVN: exist:[17442] trunk/eXist/src/org/exist/xquery/ value/OrderedValueSequence.java

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

Revision: 17442
          http://sourceforge.net/p/exist/code/17442
Author:   wolfgang_m
Date:     2012-10-30 22:40:56 +0000 (Tue, 30 Oct 2012)
Log Message:
-----------
[bugfix] Wrong computation of item type for ordered sequence, causing cast errors.

Modified Paths:
--------------
    trunk/eXist/src/org/exist/xquery/value/OrderedValueSequence.java

Modified: trunk/eXist/src/org/exist/xquery/value/OrderedValueSequence.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/value/OrderedValueSequence.java	2012-10-30 20:33:51 UTC (rev 17441)
+++ trunk/eXist/src/org/exist/xquery/value/OrderedValueSequence.java	2012-10-30 22:40:56 UTC (rev 17442)
@@ -141,12 +141,12 @@
 	}
 
 	private void checkItemType(int type) {
-        if(itemType == Type.NODE || itemType == type)
+        if (itemType == type)
             return;
-        if(itemType == Type.ANY_TYPE)
+        else if (itemType == Type.ANY_TYPE)
             itemType = type;
         else
-            itemType = Type.NODE;
+            itemType = Type.getCommonSuperType(type, itemType);
     }
     
     /* (non-Javadoc)