changeset 859:c62352b6670e

Merge
author lana
date Wed, 09 Oct 2013 14:17:39 -0700
parents acb5bb19d9de 9d261303a659
children c2b11434288e
files .hgtags
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Sep 12 17:17:30 2013 -0700
+++ b/.hgtags	Wed Oct 09 14:17:39 2013 -0700
@@ -342,4 +342,5 @@
 7255fb6c9060b0626aeedb1066e73c4bb46b1a7c jdk7u40-b41
 66363323f14d85d4ab28e883a3323b9d72dea5fd jdk7u40-b42
 c0bd71414ea513f54f23965936a837fca093ac91 jdk7u40-b43
+91bc4534851265291bb3b16452a0968d6909979f jdk7u40-b60
 d9b92749a0f4c8e6c6f4fe11210c2a02d70bae74 jdk7u60-b00
--- a/src/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIterNodeList.java	Thu Sep 12 17:17:30 2013 -0700
+++ b/src/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIterNodeList.java	Wed Oct 09 14:17:39 2013 -0700
@@ -105,15 +105,15 @@
      */
     public Node item(int index) {
         if (m_iter != null) {
-            int node;
+            int node = 0;
             int count = m_cachedNodes.size();
 
             if (count > index) {
                 node = m_cachedNodes.elementAt(index);
                 return m_dtm.getNode(node);
             } else if (m_last == -1) {
-                while (((node = m_iter.next()) != DTMAxisIterator.END)
-                           && count <= index) {
+                while (count <= index
+                        && ((node = m_iter.next()) != DTMAxisIterator.END)) {
                     m_cachedNodes.addElement(node);
                     count++;
                 }