diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-09-18 20:40:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-18 20:40:22 +0000 |
| commit | 07d35c37ce79a64bdd905b394d40fc9bbb18fa60 (patch) | |
| tree | e8787c45e494dfcc558faf0f75956f8785c39b94 /platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/masterKey/MasterKeyPasswordSafe.java | |
| parent | e222a9e1e66670a56e926a6b0f3e10231eeeb1fb (diff) | |
| parent | b5fb31ef6a38f19404859755dbd2e345215b97bf (diff) | |
| download | idea-07d35c37ce79a64bdd905b394d40fc9bbb18fa60.tar.gz | |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/masterKey/MasterKeyPasswordSafe.java')
| -rw-r--r-- | platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/masterKey/MasterKeyPasswordSafe.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/masterKey/MasterKeyPasswordSafe.java b/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/masterKey/MasterKeyPasswordSafe.java index de5d67b5e2d8..4d3a502c253e 100644 --- a/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/masterKey/MasterKeyPasswordSafe.java +++ b/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/masterKey/MasterKeyPasswordSafe.java @@ -193,7 +193,7 @@ public class MasterKeyPasswordSafe extends BasePasswordSafeProvider { } return myKey.get().get(); } - }, project == null ? Condition.FALSE : project.getDisposed()); + }, project == null ? Conditions.alwaysFalse() : project.getDisposed()); if (key instanceof byte[]) return (byte[])key; if (key instanceof PasswordSafeException) throw (PasswordSafeException)key; |