Index: src/test/java/org/apache/jackrabbit/core/query/lucene/InterruptedQueryTest.java
===================================================================
--- src/test/java/org/apache/jackrabbit/core/query/lucene/InterruptedQueryTest.java	(revision 0)
+++ src/test/java/org/apache/jackrabbit/core/query/lucene/InterruptedQueryTest.java	(revision 0)
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.apache.jackrabbit.core.query.lucene;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.jcr.RepositoryException;
+import javax.jcr.query.Query;
+
+import org.apache.jackrabbit.core.query.AbstractQueryTest;
+
+public class InterruptedQueryTest extends AbstractQueryTest {
+
+    public void testQuery() throws Exception {
+        final AtomicBoolean stop = new AtomicBoolean(false);
+        final List<Exception> exceptions = Collections.synchronizedList(
+                new ArrayList<Exception>());
+        Thread t = new Thread(new Runnable() {
+            @Override
+            public void run() {
+                while (!stop.get() && exceptions.isEmpty()) {
+                    try {
+                        // execute query
+                        String stmt = "//*[@jcr:primaryType='nt:unstructured']";
+                        qm.createQuery(stmt, Query.XPATH).execute();
+                    } catch (RepositoryException e) {
+                        exceptions.add(e);
+                    }
+                }
+            }
+        });
+        t.start();
+        for (int i = 0; i < 200 && t.isAlive(); i++) {
+            t.interrupt();
+            Thread.sleep((long) (100.0 * Math.random())); 
+        }
+        stop.set(true);
+        t.join();
+        if (!exceptions.isEmpty()) {
+            fail(exceptions.get(0).toString());
+        }
+    }
+}
Index: src/main/java/org/apache/jackrabbit/core/query/lucene/QueryResultImpl.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/query/lucene/QueryResultImpl.java	(revision 1414700)
+++ src/main/java/org/apache/jackrabbit/core/query/lucene/QueryResultImpl.java	(working copy)
@@ -296,8 +296,7 @@
             // update numResults
             numResults = result.getSize();
         } catch (IOException e) {
-            log.error("Exception while executing query: ", e);
-            // todo throw?
+            throw new RepositoryException(e);
         } finally {
             if (result != null) {
                 try {