[7u4] Review request for 7147435: closed/java/awt/Toolkit/Headless/WrappedToolkitTest/WrappedToolkitTest.sh failed since 7u4b11

[Anthony Petrov]

Hello,

Please review a fix for 
http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7147435 at:

http://cr.openjdk.java.net/~anthony/7u4-2-headlessTestFailed-7147435.0/

This bug is a regression of 7124511 fixed for the JDK Mac Port [1]. With 
that fix the code setting the awt.toolkit and java.awt.graphicsenv 
system properties has been removed from JNI_OnLoad() of libawt.so. 
Actually, the test WrappedToolkitTest.sh relies on the ability to 
override the default toolkit by means of setting the AWT_TOOLKIT 
environment variable, and because of the removal the test has failed.

With the fix for 7147435 I'm restoring the removed parts. In order to 
not break the fix for 7124511, I'm setting the system properties only if 
the XToolkit has been requested explicitly.

[1] http://cr.openjdk.java.net/~anthony/x-5-forceHeadless.0/

--
best regards,
Anthony