diff options
author | Oleg Besedin | 2008-04-30 18:57:14 +0000 |
---|---|---|
committer | Oleg Besedin | 2008-04-30 18:57:14 +0000 |
commit | 31fdf3b163abf809478a100dfb9f8a56e3882c11 (patch) | |
tree | fe1208ac1f43c0a202a967b75ea27ebcbf798ae1 /bundles/org.eclipse.equinox.security | |
parent | 14f187679366b66fa0ba8783eb7459b3c1c65235 (diff) | |
download | rt.equinox.bundles-31fdf3b163abf809478a100dfb9f8a56e3882c11.tar.gz rt.equinox.bundles-31fdf3b163abf809478a100dfb9f8a56e3882c11.tar.xz rt.equinox.bundles-31fdf3b163abf809478a100dfb9f8a56e3882c11.zip |
Bug 229594 StorageException in Build I20080429-0100
Diffstat (limited to 'bundles/org.eclipse.equinox.security')
-rw-r--r-- | bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/storage/SecurePreferencesRoot.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/storage/SecurePreferencesRoot.java b/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/storage/SecurePreferencesRoot.java index f7320914f..2393dd9c8 100644 --- a/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/storage/SecurePreferencesRoot.java +++ b/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/storage/SecurePreferencesRoot.java @@ -21,8 +21,7 @@ import org.eclipse.core.runtime.jobs.ILock; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.equinox.internal.security.auth.AuthPlugin; import org.eclipse.equinox.internal.security.auth.nls.SecAuthMessages; -import org.eclipse.equinox.internal.security.storage.friends.IStorageConstants; -import org.eclipse.equinox.internal.security.storage.friends.IUICallbacks; +import org.eclipse.equinox.internal.security.storage.friends.*; import org.eclipse.equinox.security.storage.StorageException; import org.eclipse.equinox.security.storage.provider.*; import org.eclipse.osgi.util.NLS; @@ -237,6 +236,11 @@ public class SecurePreferencesRoot extends SecurePreferences implements IStorage return (PasswordExt) passwordCache.get(key); } + // if this is (a headless run or JUnit) and prompt hint is not set up, set it to "false" + boolean supressPrompts = !CallbacksProvider.getDefault().runningUI() || InternalExchangeUtils.isJUnitApp(); + if (supressPrompts && container != null && !container.hasOption(IProviderHints.PROMPT_USER)) + ((SecurePreferencesContainer) container).setOption(IProviderHints.PROMPT_USER, new Boolean(false)); + // is there password verification string already? SecurePreferences node = node(PASSWORD_VERIFICATION_NODE); boolean newPassword = !node.hasKey(key); |