changeset 863:c2b11434288e

Merge
author asaha
date Mon, 14 Oct 2013 23:17:37 -0700
parents 8da2a772ccbf c62352b6670e
children 036cf3985427
files .hgtags
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Oct 09 15:06:23 2013 -0700
+++ b/.hgtags	Mon Oct 14 23:17:37 2013 -0700
@@ -359,6 +359,7 @@
 66363323f14d85d4ab28e883a3323b9d72dea5fd jdk7u40-b42
 c0bd71414ea513f54f23965936a837fca093ac91 jdk7u40-b43
 91bc4534851265291bb3b16452a0968d6909979f jdk7u40-b60
+d9b92749a0f4c8e6c6f4fe11210c2a02d70bae74 jdk7u60-b00
 c500d4ec41ff2117eabfa33e640b6df2f21deb3d jdk7u40-b61
 9e3f8ab9d17be6b1a4a097fcc5bc5412013d3e86 jdk7u40-b62
 1a7e2024963d3a8d6cde209de0967ac43418b82a jdk7u45-b01
--- a/src/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIterNodeList.java	Wed Oct 09 15:06:23 2013 -0700
+++ b/src/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIterNodeList.java	Mon Oct 14 23:17:37 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++;
                 }