Author: scooter
Date: 2012-09-12 17:03:01 -0700 (Wed, 12 Sep 2012)
New Revision: 30361

Modified:
   
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/bitmap/URLImageCustomGraphics.java
Log:
Fix a lingering NPE on shutdown.


Modified: 
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/bitmap/URLImageCustomGraphics.java
===================================================================
--- 
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/bitmap/URLImageCustomGraphics.java
        2012-09-12 23:51:05 UTC (rev 30360)
+++ 
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/bitmap/URLImageCustomGraphics.java
        2012-09-13 00:03:01 UTC (rev 30361)
@@ -158,9 +158,9 @@
                        tagStr = temp.substring(0, temp.length() - 1);
                }
 
-               String name = sourceUrl.toString();
-               if (name == null)
-                       name = displayName;
+               String name = displayName;
+               if (sourceUrl != null)
+                       name = sourceUrl.toString();
 
                if (name.contains(",")) {
                        // Replace delimiter

-- 
You received this message because you are subscribed to the Google Groups 
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/cytoscape-cvs?hl=en.

Reply via email to