aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Besedin2012-03-19 11:11:43 (EDT)
committerOleg Besedin2012-03-19 11:11:43 (EDT)
commit34170596b63a67e8aa4227470b241d381564ff3d (patch)
tree978229b83aaf2a5060dd2ab7481ead6e440934ff
parent9c80c8123c5b7ff39843d63bbc6b9742bbf8d4d2 (diff)
downloadrt.equinox.bundles-34170596b63a67e8aa4227470b241d381564ff3d.zip
rt.equinox.bundles-34170596b63a67e8aa4227470b241d381564ff3d.tar.gz
rt.equinox.bundles-34170596b63a67e8aa4227470b241d381564ff3d.tar.bz2
Bug 374466 - NPE from PasswordProviderSelector.getInstance when usedv20120319-1511
without start levels
-rw-r--r--bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/auth/AuthPlugin.java4
-rw-r--r--bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/storage/PasswordProviderSelector.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/auth/AuthPlugin.java b/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/auth/AuthPlugin.java
index 6745329..a056c96 100644
--- a/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/auth/AuthPlugin.java
+++ b/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/auth/AuthPlugin.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
+ * Copyright (c) 2005, 2012 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -70,7 +70,7 @@ public class AuthPlugin implements BundleActivator {
public void stop(BundleContext context) throws Exception {
- PasswordProviderSelector.getInstance().stop();
+ PasswordProviderSelector.stop();
SecurePreferencesMapper.stop();
SecurePlatformInternal.getInstance().stop();
diff --git a/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/storage/PasswordProviderSelector.java b/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/storage/PasswordProviderSelector.java
index 798d2a8..b66feeb 100644
--- a/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/storage/PasswordProviderSelector.java
+++ b/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/storage/PasswordProviderSelector.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2010 IBM Corporation and others.
+ * Copyright (c) 2008, 2012 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -69,7 +69,7 @@ public class PasswordProviderSelector implements IRegistryEventListener {
return instance;
}
- public void stop() {
+ static public void stop() {
if (instance != null) {
IExtensionRegistry registry = RegistryFactory.getRegistry();
registry.removeListener(instance);