diff options
| author | Peter Dettman <peter.dettman@bouncycastle.org> | 2015-08-14 18:39:29 +0700 |
|---|---|---|
| committer | Peter Dettman <peter.dettman@bouncycastle.org> | 2015-08-14 18:39:29 +0700 |
| commit | 56f23bcdee9c54b6fa3222a759d8df3780e8ac68 (patch) | |
| tree | e5fca176186ea692606506d78da2d57462abe43c /crypto/src/asn1 | |
| parent | Add locking to lazy factory property (diff) | |
| parent | Refactor NextPacketTag() (diff) | |
| download | BouncyCastle.NET-ed25519-56f23bcdee9c54b6fa3222a759d8df3780e8ac68.tar.xz | |
Merge branch 'master' of git.bouncycastle.org:bc-csharp
Conflicts: crypto/src/asn1/x9/X9ECParametersHolder.cs
Diffstat (limited to 'crypto/src/asn1')
| -rw-r--r-- | crypto/src/asn1/x9/X9ECParametersHolder.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crypto/src/asn1/x9/X9ECParametersHolder.cs b/crypto/src/asn1/x9/X9ECParametersHolder.cs index f0a320094..e802b738c 100644 --- a/crypto/src/asn1/x9/X9ECParametersHolder.cs +++ b/crypto/src/asn1/x9/X9ECParametersHolder.cs @@ -10,15 +10,15 @@ namespace Org.BouncyCastle.Asn1.X9 { lock (this) { - if (parameters == null) - { - parameters = CreateParameters(); - } + if (parameters == null) + { + parameters = CreateParameters(); + } return parameters; } } - } + } protected abstract X9ECParameters CreateParameters(); } |