Merge pull request #5517 from GraphGeeks/2.3-fix-4984_incorrect_excep…

…tion_on_column_as Fix #4984 - UnsupportedOperationException on ResourceIterator::remove()
neo4j · Oct 8, 2015 · ad26fd2 · ad26fd2
2 parents 9a9389e + 561be62
commit ad26fd2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...iler-2.3/src/main/scala/org/neo4j/cypher/internal/compiler/v2_3/PipeExecutionResult.scala b/...iler-2.3/src/main/scala/org/neo4j/cypher/internal/compiler/v2_3/PipeExecutionResult.scala
@@ -100,7 +100,7 @@ class PipeExecutionResult(val result: ResultIterator,
   }
 
   private trait WrappingResourceIterator[T] extends ResourceIterator[T] {
-    def remove() { Collections.emptyIterator[T]().remove() }
+    def remove() { throw new UnsupportedOperationException("remove") }
     def close() { self.close() }
   }
 

diff --git a/...scala/org/neo4j/cypher/internal/compiler/v2_3/executionplan/CompiledExecutionResult.scala b/...scala/org/neo4j/cypher/internal/compiler/v2_3/executionplan/CompiledExecutionResult.scala
@@ -252,7 +252,7 @@ class CompiledExecutionResult(taskCloser: TaskCloser,
     new EntityNotFoundException("No column named '" + column + "' was found. Found: " + data.keys.mkString("(\"", "\", \"", "\")"))
 
   private trait WrappingResourceIterator[T] extends ResourceIterator[T] {
-    def remove() { Collections.emptyIterator[T]().remove() }
+    def remove() { throw new UnsupportedOperationException("remove") }
     def close() { self.close() }
   }