ibex.core updates for new api

[org.ibex.core.git] / src / org / ibex / graphics / Picture.java

diff --git a/src/org/ibex/graphics/Picture.java b/src/org/ibex/graphics/Picture.java
index 528b0d7..572823c 100644 (file)
--- a/src/org/ibex/graphics/Picture.java
+++ b/src/org/ibex/graphics/Picture.java
@@ -32,10 +32,16 @@ public class Picture {
 
     /** turns a stream into a Picture.Source and passes it to the callback */
     public static Picture load(final JS stream, final Task callback) {
+        if(stream == null) throw new NullPointerException();
         Picture ret = (Picture)cache.get(stream);
-        if (ret == null) cache.put(stream, ret = Platform.createPicture(stream));
+        if (ret == null) {
+            ret = Platform.createPicture(stream);
+            if(ret == null) throw new NullPointerException();
+            cache.put(stream, ret);
+        }
         final Picture p = ret;
         if (!ret.isLoaded && callback != null) {
+            // FEATURE: This is kind of ugly - shouldn't need a blessing
             final Ibex.Blessing b = Ibex.Blessing.getBlessing(stream);
             new java.lang.Thread() { public void run() {
                 InputStream in = null;