diff options
author | hristoterezov <hristo@jitsi.org> | 2014-04-03 11:35:06 +0300 |
---|---|---|
committer | hristoterezov <hristo@jitsi.org> | 2014-04-03 11:35:06 +0300 |
commit | 1933dc6a89d0f2a0007a370a90abb95b48685fba (patch) | |
tree | 86b7196d438907ecc9e8922eb169d6cec0d33f06 /src/net/java/sip/communicator/plugin/addrbook | |
parent | 037599f369dda34f589dfd881f148ece82271ae3 (diff) | |
download | jitsi-1933dc6a89d0f2a0007a370a90abb95b48685fba.zip jitsi-1933dc6a89d0f2a0007a370a90abb95b48685fba.tar.gz jitsi-1933dc6a89d0f2a0007a370a90abb95b48685fba.tar.bz2 |
Fixes CalendarService exception on MacOS.
Diffstat (limited to 'src/net/java/sip/communicator/plugin/addrbook')
-rw-r--r-- | src/net/java/sip/communicator/plugin/addrbook/AddrBookActivator.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/net/java/sip/communicator/plugin/addrbook/AddrBookActivator.java b/src/net/java/sip/communicator/plugin/addrbook/AddrBookActivator.java index c99bbd4..6867be9 100644 --- a/src/net/java/sip/communicator/plugin/addrbook/AddrBookActivator.java +++ b/src/net/java/sip/communicator/plugin/addrbook/AddrBookActivator.java @@ -99,8 +99,7 @@ public class AddrBookActivator /** * The calendar service */ - private static CalendarServiceImpl calendarService - = new CalendarServiceImpl(); + private static CalendarServiceImpl calendarService = null; /** * List of the providers with registration listener. @@ -121,8 +120,9 @@ public class AddrBookActivator { if(evt.getNewState().equals(RegistrationState.REGISTERED)) { - calendarService.handleProviderAdded( - evt.getProvider()); + if(calendarService != null) + calendarService.handleProviderAdded( + evt.getProvider()); } } }; @@ -389,6 +389,7 @@ public class AddrBookActivator if(OSUtils.IS_WINDOWS && !getConfigService().getBoolean( CalendarService.PNAME_FREE_BUSY_STATUS_DISABLED, false)) { + calendarService = new CalendarServiceImpl(); try { MsOutlookAddrBookContactSourceService.initMAPI(null); |