Index: trunk/modules/awt/src/main/java/common/java/awt/image/ColorModel.java =================================================================== --- trunk/modules/awt/src/main/java/common/java/awt/image/ColorModel.java (revision 495637) +++ trunk/modules/awt/src/main/java/common/java/awt/image/ColorModel.java (working copy) @@ -189,6 +189,12 @@ public float[] getNormalizedComponents(Object pixel, float[] normComponents, int normOffset) { + + if (pixel == null) { + // awt.294=pixel is null + throw new NullPointerException(Messages.getString("awt.294")); //$NON-NLS-1$ + } + int unnormComponents[] = getComponents(pixel, null, 0); return getNormalizedComponents(unnormComponents, 0, normComponents, normOffset); Index: trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/internal/nls/messages.properties =================================================================== --- trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/internal/nls/messages.properties (revision 495637) +++ trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/internal/nls/messages.properties (working copy) @@ -483,6 +483,7 @@ awt.291=Source and destination images do not have the same width! awt.292=Source and destination images do not have the same height! awt.293=SampleModel and DataBuffer have different data types +awt.294=pixel is null awt.err.00=file dialog {0} error! awt.err.01=error: {0}