Merge change I22807d19 into eclair-mr2

* changes:
  Do not use the Cursor if it is closed.