summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wielaard <mark@klomp.org>2006-12-06 21:53:23 +0000
committerMark Wielaard <mark@klomp.org>2006-12-06 21:53:23 +0000
commit2f96fde3dd60a85cb00325dc760c42c84cf30c5c (patch)
treee1382bd64e6696818655bd9331b14a8d5100f7e3
parent8f99687ea3a48a7010897ad02665fd58aa06d0ae (diff)
downloadclasspath-2f96fde3dd60a85cb00325dc760c42c84cf30c5c.tar.gz
* gnu/java/awt/peer/gtk/AsyncImage.java (addObserver): Never notify
null Observer.
-rw-r--r--ChangeLog5
-rw-r--r--gnu/java/awt/peer/gtk/AsyncImage.java2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 767e0b3d1..3f4cbb013 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-06 Mark Wielaard <mark@klomp.org>
+
+ * gnu/java/awt/peer/gtk/AsyncImage.java (addObserver): Never notify
+ null Observer.
+
2006-12-06 Roman Kennke <kennke@aicas.com>
* examples/gnu/classpath/examples/icons/back.png,
diff --git a/gnu/java/awt/peer/gtk/AsyncImage.java b/gnu/java/awt/peer/gtk/AsyncImage.java
index bf1df298c..e55b4aafe 100644
--- a/gnu/java/awt/peer/gtk/AsyncImage.java
+++ b/gnu/java/awt/peer/gtk/AsyncImage.java
@@ -225,7 +225,7 @@ public class AsyncImage
}
}
}
- else
+ else if (obs != null)
{
// When the image is complete, notify the observer. Dunno if that's
// really needed, but to be sure.