Index: trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/CommonGraphics2D.java =================================================================== --- trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/CommonGraphics2D.java (revision 490482) +++ trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/CommonGraphics2D.java (working copy) @@ -130,9 +130,9 @@ // Clipping things protected MultiRectArea clip = null; - protected Paint paint = Color.BLACK; - protected Color fgColor = Color.BLACK; - protected Color bgColor = Color.WHITE; + protected Paint paint = Color.WHITE; + protected Color fgColor = Color.WHITE; + protected Color bgColor = Color.BLACK; protected Composite composite = AlphaComposite.SrcOver; @@ -978,8 +978,10 @@ @Override public void setColor(Color color) { - fgColor = color; - paint = color; + if (color != null) { + fgColor = color; + paint = color; + } } @Override