1 files changed, 13 insertions, 4 deletions
diff --git a/libjava/classpath/gnu/regexp/RETokenEndSub.java b/libjava/classpath/gnu/regexp/RETokenEndSub.java
index fe2969d0592..fca01c7f3a4 100644
--- a/libjava/classpath/gnu/regexp/RETokenEndSub.java
+++ b/libjava/classpath/gnu/regexp/RETokenEndSub.java
@@ -1,5 +1,5 @@
 /* gnu/regexp/RETokenEndSub.java
-   Copyright (C) 2001, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -46,12 +46,21 @@ final class RETokenEndSub extends REToken {
       return 0;
     }
     
-    boolean match(CharIndexed input, REMatch mymatch) {
+    REMatch matchThis(CharIndexed input, REMatch mymatch) {
+	mymatch.start[subIndex] = mymatch.start1[subIndex];
 	mymatch.end[subIndex] = mymatch.index;
-	return next(input, mymatch);
+	return mymatch;
     }
-    
+
+    REMatch findMatch(CharIndexed input, REMatch mymatch) {
+	mymatch.start[subIndex] = mymatch.start1[subIndex];
+	mymatch.end[subIndex] = mymatch.index;
+	return super.findMatch(input, mymatch);
+    }
+
     void dump(StringBuffer os) {
 	// handled by RE
+	// But add something for debugging.
+	os.append("(?#RETokenEndSub subIndex=" + subIndex + ")");
     }
 }