Index: src/test/org/codehaus/groovy/control/io/AbstractReaderSourceTest.java
===================================================================
--- src/test/org/codehaus/groovy/control/io/AbstractReaderSourceTest.java	(revision 0)
+++ src/test/org/codehaus/groovy/control/io/AbstractReaderSourceTest.java	(revision 0)
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2003-2007 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.codehaus.groovy.control.io;
+
+import junit.framework.TestCase;
+import org.codehaus.groovy.control.CompilerConfiguration;
+import org.codehaus.groovy.control.Janitor;
+
+import java.io.Reader;
+import java.io.IOException;
+import java.io.StringReader;
+
+/**
+ * Unit test for AbstractReaderSource.
+ *
+ * @author Hamlet D'Arcy
+ */
+public class AbstractReaderSourceTest extends TestCase {
+
+    private static final String SAMPLE_SOURCE_LINE1 = "def x = 1;";
+    private static final String SAMPLE_SOURCE_LINE2 = "def y = 2;";
+    private static final String SAMPLE_SOURCE_LINE3 = "x+y";
+    private AbstractReaderSourceSubclass readerSource;
+    private Janitor janitor;
+
+    protected void setUp() throws Exception {
+        readerSource = new AbstractReaderSourceSubclass();
+        janitor = new Janitor();
+    }
+
+
+    public void testGetLine() {
+
+        final String line0 = readerSource.getLine(0, janitor);
+        final String line1 = readerSource.getLine(1, janitor);
+        final String line2 = readerSource.getLine(2, janitor);
+        final String line3 = readerSource.getLine(3, janitor);
+        final String line4 = readerSource.getLine(4, janitor);
+
+        assertNull("out of bounds request should return null", line0);
+        assertEquals("Wrong source line", SAMPLE_SOURCE_LINE1, line1);
+        assertEquals("Wrong source line", SAMPLE_SOURCE_LINE2, line2);
+        assertEquals("Wrong source line", SAMPLE_SOURCE_LINE3, line3);
+        assertNull("out of bounds request should return null", line4);
+    }
+
+    public void testGetLine_NullJanitor() {
+
+        final String line = readerSource.getLine(1, null);
+
+        assertEquals("Wrong source line", SAMPLE_SOURCE_LINE1, line);
+    }
+
+    /**
+     * This is a test specific subclass for AbstractReaderSource.
+     */
+    private static class AbstractReaderSourceSubclass extends AbstractReaderSource {
+
+        private AbstractReaderSourceSubclass() {
+            super(new CompilerConfiguration());
+        }
+
+        public Reader getReader() throws IOException {
+            return new StringReader(
+                    SAMPLE_SOURCE_LINE1 + "\n" + SAMPLE_SOURCE_LINE2 + "\n" + SAMPLE_SOURCE_LINE3 + "\n"
+            );
+        }
+    }
+}
\ No newline at end of file
Index: src/main/org/codehaus/groovy/control/io/AbstractReaderSource.java
===================================================================
--- src/main/org/codehaus/groovy/control/io/AbstractReaderSource.java	(revision 16798)
+++ src/main/org/codehaus/groovy/control/io/AbstractReaderSource.java	(working copy)
@@ -87,7 +87,9 @@
             }
 
             if (janitor == null) {
+                final String result = line;   // otherwise cleanup() will wipe out value
                 cleanup();
+                return result;
             } else {
                 janitor.register(this);
             }