aboutsummaryrefslogtreecommitdiffstats
path: root/src/net
diff options
context:
space:
mode:
Diffstat (limited to 'src/net')
-rw-r--r--src/net/java/sip/communicator/plugin/addrbook/msoutlook/MsOutlookAddrBookContactQuery.java15
1 files changed, 11 insertions, 4 deletions
diff --git a/src/net/java/sip/communicator/plugin/addrbook/msoutlook/MsOutlookAddrBookContactQuery.java b/src/net/java/sip/communicator/plugin/addrbook/msoutlook/MsOutlookAddrBookContactQuery.java
index 43fa585..c2bf8c8 100644
--- a/src/net/java/sip/communicator/plugin/addrbook/msoutlook/MsOutlookAddrBookContactQuery.java
+++ b/src/net/java/sip/communicator/plugin/addrbook/msoutlook/MsOutlookAddrBookContactQuery.java
@@ -810,10 +810,17 @@ public class MsOutlookAddrBookContactQuery
id,
MAPI_MAILUSER_PROP_IDS,
MAPI_UNICODE);
- long objType
- = (props[PR_OBJECT_TYPE] instanceof Long)
- ? ((Long) props[PR_OBJECT_TYPE]).longValue()
- : 0;
+ long objType = 0;
+ if(props != null
+ && props[PR_OBJECT_TYPE] != null
+ && props[PR_OBJECT_TYPE] instanceof Long)
+ {
+ objType = ((Long) props[PR_OBJECT_TYPE]).longValue();
+ }
+ else
+ {
+ return false;
+ }
// If we have results from the Contacts folder(s), don't read from the
// Address Book because there may be duplicates.