Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/DescendantSelfAxisQuery.java
===================================================================
--- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/DescendantSelfAxisQuery.java	(revision 1367695)
+++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/DescendantSelfAxisQuery.java	(working copy)
@@ -502,15 +502,8 @@
                 return currentDoc;
             }
 
-            // optimize in the case of an advance to finish.
-            // see https://issues.apache.org/jira/browse/JCR-3082
-            if (target == NO_MORE_DOCS) {
-                subScorer.advance(target);
-                currentDoc = NO_MORE_DOCS;
-                return currentDoc;
-            }
-
-            currentDoc = subScorer.nextDoc();
+            currentDoc = subScorer.advance(target);
+            
             if (currentDoc == NO_MORE_DOCS) {
                 return NO_MORE_DOCS;
             } else {