Thank you very much for your reply. It pointed me in the right direction.
I have created a patch that -seems- to solve this problem. I have attached it to the bug you link as above.
[Message sent by forum member 'dcam' (dcam)]
http://forums.java.net/jive/thread.jspa?messageID=299951