Restored JDK 1.5 compatibility. Bug: http://issues.apache.org/bugzilla/show_bug.cgi?id=33645 Submitted by: Oskar Berggren <d99beo.at.dtek.chalmers.se>