aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java/sip/communicator/impl/resources/ResourceManagementServiceImpl.java
diff options
context:
space:
mode:
authorMatthieu Casanova <kpouer@java.net>2010-04-06 12:55:21 +0000
committerMatthieu Casanova <kpouer@java.net>2010-04-06 12:55:21 +0000
commit59eea1785fab8303aa6a6032be745d171a09dca5 (patch)
treecbbeacabcb686947706585ae23d9d7836e60ea5b /src/net/java/sip/communicator/impl/resources/ResourceManagementServiceImpl.java
parenta99cde44a799e408abbe226b9077cb8f9c93691f (diff)
downloadjitsi-59eea1785fab8303aa6a6032be745d171a09dca5.zip
jitsi-59eea1785fab8303aa6a6032be745d171a09dca5.tar.gz
jitsi-59eea1785fab8303aa6a6032be745d171a09dca5.tar.bz2
Fix NPE when trying to get an image from an imageID that is missing in the resources
Diffstat (limited to 'src/net/java/sip/communicator/impl/resources/ResourceManagementServiceImpl.java')
-rw-r--r--src/net/java/sip/communicator/impl/resources/ResourceManagementServiceImpl.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/net/java/sip/communicator/impl/resources/ResourceManagementServiceImpl.java b/src/net/java/sip/communicator/impl/resources/ResourceManagementServiceImpl.java
index cd66625..8c7283a 100644
--- a/src/net/java/sip/communicator/impl/resources/ResourceManagementServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/resources/ResourceManagementServiceImpl.java
@@ -670,7 +670,10 @@ public class ResourceManagementServiceImpl
public ImageIcon getImage(String imageID)
{
URL imageURL = getImageURL(imageID);
-
+ if (imageURL == null)
+ {
+ return null;
+ }
return new ImageIcon(imageURL);
}
}