Fix NullPointerException when showing accounts configuration form.

cusax-fix
Yana Stamcheva 16 years ago
parent a289689d00
commit 887db991bd

@ -179,7 +179,6 @@ public void stop(BundleContext bContext) throws Exception
public static Map<Object, ProtocolProviderFactory>
getProtocolProviderFactories()
{
ServiceReference[] serRefs = null;
try
{
@ -198,7 +197,6 @@ public void stop(BundleContext bContext) throws Exception
{
for (int i = 0; i < serRefs.length; i++)
{
ProtocolProviderFactory providerFactory
= (ProtocolProviderFactory) bundleContext
.getService(serRefs[i]);
@ -269,14 +267,25 @@ public static ProtocolProviderFactory getProtocolProviderFactory(
public static ProtocolProviderService getRegisteredProviderForAccount(
AccountID accountID)
{
ProtocolProviderFactory providerFactory
= getProtocolProviderFactory(accountID.getProtocolDisplayName());
Iterator<ProtocolProviderFactory> factories
= getProtocolProviderFactories().values().iterator();
while (factories.hasNext())
{
ProtocolProviderFactory factory = factories.next();
ServiceReference serRef
= providerFactory.getProviderForAccount(accountID);
if (factory.getRegisteredAccounts().contains(accountID))
{
ServiceReference serRef
= factory.getProviderForAccount(accountID);
if (serRef != null)
return (ProtocolProviderService) bundleContext
.getService(serRef);
}
}
return (ProtocolProviderService) GuiActivator.bundleContext
.getService(serRef);
return null;
}
/**

Loading…
Cancel
Save