Fix potential NPE in mergeOp when abandoning a change

The indexer should only be called on the change when the abandon
was successful.  Calling it outside of the try..finally block may
result in it being called with a null change.

Found with FindBugs.

Change-Id: I2dc5a4e40482e55d702935e32a74638670f18675
1 file changed