SECURITY-792 made the code compatible with Java 5 - unfortunately the array handling fix has caused a regression so this needs to be revisited to ensure the array is manipulated properly.