diff options
| -rw-r--r-- | src/net/java/sip/communicator/impl/configuration/ConfigurationActivator.java | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/src/net/java/sip/communicator/impl/configuration/ConfigurationActivator.java b/src/net/java/sip/communicator/impl/configuration/ConfigurationActivator.java index 3510da6..e6cee27 100644 --- a/src/net/java/sip/communicator/impl/configuration/ConfigurationActivator.java +++ b/src/net/java/sip/communicator/impl/configuration/ConfigurationActivator.java @@ -49,20 +49,22 @@ public class ConfigurationActivator { FileAccessService fas = ServiceUtils.getService(bundleContext, FileAccessService.class); - File useDatabaseConfig = fas.getPrivatePersistentFile( - ".usedatabaseconfig", - FileCategory.PROFILE); - - // BETA: if the marker file exists, use the database configuration - if (useDatabaseConfig.exists()) + if (fas != null) { - logger.info("Using database configuration store."); - this.cs = new JdbcConfigService(fas); + File useDatabaseConfig = fas.getPrivatePersistentFile( + ".usedatabaseconfig", + FileCategory.PROFILE); + + // BETA: if the marker file exists, use the database configuration + if (useDatabaseConfig.exists()) + { + logger.info("Using database configuration store."); + this.cs = new JdbcConfigService(fas); + } } - else - { + + if (this.cs == null) this.cs = LibJitsi.getConfigurationService(); - } bundleContext.registerService( ConfigurationService.class.getName(), |