correcting return type

getArray returns an array - I think some other types are wrong too in this class.
(cherry picked from commit 69460d3)
Merge remote-tracking branch 'upstream/b-dev-ce' into b-dev-ce