Index: gnu/xml/transform/StreamSerializer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/xml/transform/StreamSerializer.java,v
retrieving revision 1.6
diff -u -r1.6 StreamSerializer.java
--- gnu/xml/transform/StreamSerializer.java	2 Jul 2005 20:32:16 -0000	1.6
+++ gnu/xml/transform/StreamSerializer.java	6 Jul 2005 20:16:32 -0000
@@ -627,17 +627,32 @@
         text = buf.toString();
       }
     ByteBuffer encoded = encoder.encode(CharBuffer.wrap(text));
+    int len = encoded.limit() - encoded.position();
     if (encoded.hasArray())
       {
-        return encoded.array();
+        byte[] ret = encoded.array();
+        if (ret.length > len)
+          {
+            // Why?
+            byte[] ret2 = new byte[len];
+            System.arraycopy(ret, 0, ret2, 0, len);
+            ret = ret2;
+          }
+        return ret;
       }
     encoded.flip();
-    int len = encoded.limit() - encoded.position();
     byte[] ret = new byte[len];
     encoded.get(ret, 0, len);
     return ret;
   }
 
+  String hex(byte[] b) {
+    StringBuffer buf = new StringBuffer();
+    for (int i = 0; i < b.length; i++)
+      buf.append(Integer.toHexString(b[i])).append(' ');
+    return buf.toString();
+  }
+
   String encode(String text, boolean encodeCtl, boolean inAttr)
   {
     int len = text.length();
Index: gnu/xml/xpath/EqualityExpr.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/xml/xpath/EqualityExpr.java,v
retrieving revision 1.2
diff -u -r1.2 EqualityExpr.java
--- gnu/xml/xpath/EqualityExpr.java	2 Jul 2005 20:32:22 -0000	1.2
+++ gnu/xml/xpath/EqualityExpr.java	6 Jul 2005 20:16:32 -0000
@@ -91,6 +91,10 @@
       {
         Collection lns = (Collection) left;
         Collection rns = (Collection) right;
+        if (lns.isEmpty())
+          {
+            return false;
+          }
         boolean all = true;
         for (Iterator i = lns.iterator(); i.hasNext(); )
           {
@@ -119,7 +123,7 @@
                   }
               }
           }
-        return false;
+        return all;
       }
     /* 
      * If one object to be compared is a node-set and the other is a number,