Index: trunk/modules/awt/src/main/java/common/java/awt/image/ComponentSampleModel.java =================================================================== --- trunk/modules/awt/src/main/java/common/java/awt/image/ComponentSampleModel.java (revision 495562) +++ trunk/modules/awt/src/main/java/common/java/awt/image/ComponentSampleModel.java (working copy) @@ -399,6 +399,11 @@ } else { samples = iArray; } + + if (data == null) { + // awt.294=data is null + throw new NullPointerException(Messages.getString("awt.294")); //$NON-NLS-1$ + } for (int i = y; i < y + h; i++) { for (int j = x; j < x + w; j++) { 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 495562) +++ 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=data is null awt.err.00=file dialog {0} error! awt.err.01=error: {0}