summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Pursehouse <david.pursehouse@sonymobile.com>2014-11-13 10:59:53 +0900
committerDavid Pursehouse <david.pursehouse@sonymobile.com>2015-04-06 22:39:40 +0900
commit2ec9cf967754f99a314646d9398fe888b54ea9a0 (patch)
tree4b0f042cbf999bbd121ae5f1475d988128c36bd4
parente43b1b10b13e86f9c957175aca33d9c2ff592fff (diff)
Don't use deprecated PGPPublicKeyRingCollection constructor
The PGPPublicKeyRingCollection constructor was deprecated in Bouncycastle v1.51. Use BcPGPPublicKeyRingCollection instead. Change-Id: If718a6eab13ff991fae3b8334c53f2bc6227f061
-rw-r--r--gerrit-server/src/main/java/com/google/gerrit/server/contact/EncryptedContactStore.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/contact/EncryptedContactStore.java b/gerrit-server/src/main/java/com/google/gerrit/server/contact/EncryptedContactStore.java
index f43e976e81..d82180deaf 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/contact/EncryptedContactStore.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/contact/EncryptedContactStore.java
@@ -114,7 +114,7 @@ class EncryptedContactStore implements ContactStore {
private static PGPPublicKeyRingCollection readPubRing(final File pub) {
try (InputStream fin = new FileInputStream(pub);
InputStream in = PGPUtil.getDecoderStream(fin)) {
- return new PGPPublicKeyRingCollection(in);
+ return new BcPGPPublicKeyRingCollection(in);
} catch (IOException e) {
throw new ProvisionException("Cannot read " + pub, e);
} catch (PGPException e) {