Fix bug where extraAnnotations == null was not accounted for
Authored by: dcaffrey 2007-05-23
Parent: [r1007]
Child: [r1009]