diff --git a/src/net/java/sip/communicator/service/protocol/icqconstants/IcqStatusEnum.java b/src/net/java/sip/communicator/service/protocol/icqconstants/IcqStatusEnum.java index 09daeb57d..a7756c534 100644 --- a/src/net/java/sip/communicator/service/protocol/icqconstants/IcqStatusEnum.java +++ b/src/net/java/sip/communicator/service/protocol/icqconstants/IcqStatusEnum.java @@ -135,6 +135,9 @@ public static byte[] loadIcon(String imagePath) { InputStream is = IcqStatusEnum.class.getClassLoader() .getResourceAsStream(imagePath); + if(is == null) + return null; + byte[] icon = null; try { icon = new byte[is.available()]; diff --git a/src/net/java/sip/communicator/service/protocol/jabberconstants/JabberStatusEnum.java b/src/net/java/sip/communicator/service/protocol/jabberconstants/JabberStatusEnum.java index 483fadd06..0f4d8e266 100644 --- a/src/net/java/sip/communicator/service/protocol/jabberconstants/JabberStatusEnum.java +++ b/src/net/java/sip/communicator/service/protocol/jabberconstants/JabberStatusEnum.java @@ -270,6 +270,9 @@ public static byte[] loadIcon(String imagePath, Class clazz) { InputStream is = getResourceAsStream(imagePath, clazz); + if(is == null) + return null; + byte[] icon = null; try { @@ -283,7 +286,8 @@ public static byte[] loadIcon(String imagePath, Class clazz) finally { try { - is.close(); + if(is != null) + is.close(); } catch (IOException ex) { diff --git a/src/net/java/sip/communicator/service/protocol/msnconstants/MsnStatusEnum.java b/src/net/java/sip/communicator/service/protocol/msnconstants/MsnStatusEnum.java index c77160aa9..3c3298ddd 100644 --- a/src/net/java/sip/communicator/service/protocol/msnconstants/MsnStatusEnum.java +++ b/src/net/java/sip/communicator/service/protocol/msnconstants/MsnStatusEnum.java @@ -141,6 +141,9 @@ public static byte[] loadIcon(String imagePath) { InputStream is = MsnStatusEnum.class.getClassLoader() .getResourceAsStream(imagePath); + if(is == null) + return null; + byte[] icon = null; try { icon = new byte[is.available()]; diff --git a/src/net/java/sip/communicator/service/protocol/yahooconstants/YahooStatusEnum.java b/src/net/java/sip/communicator/service/protocol/yahooconstants/YahooStatusEnum.java index 3056b7a00..f66144b29 100644 --- a/src/net/java/sip/communicator/service/protocol/yahooconstants/YahooStatusEnum.java +++ b/src/net/java/sip/communicator/service/protocol/yahooconstants/YahooStatusEnum.java @@ -174,6 +174,9 @@ public static byte[] loadIcon(String imagePath) { InputStream is = YahooStatusEnum.class.getClassLoader() .getResourceAsStream(imagePath); + if(is == null) + return null; + byte[] icon = null; try { icon = new byte[is.available()];