140620

there's some other work to be done if cursor != null, so I think that ternary operator doesn't fit here