From 4e20ae308a23026652ea4aef407502734e9ee898 Mon Sep 17 00:00:00 2001 From: rickr Date: Tue, 14 Aug 2018 11:54:39 -0400 Subject: [PATCH] FABJ-347 NPE for auto clientcerts Change-Id: I94dce40d574137725539f8ee4f16dde3d0fdaff6 Signed-off-by: rickr --- src/main/java/org/hyperledger/fabric/sdk/Peer.java | 5 ++++- .../org/hyperledger/fabric/sdk/PeerEventServiceClient.java | 4 ---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/hyperledger/fabric/sdk/Peer.java b/src/main/java/org/hyperledger/fabric/sdk/Peer.java index d7632919..b8e435d4 100644 --- a/src/main/java/org/hyperledger/fabric/sdk/Peer.java +++ b/src/main/java/org/hyperledger/fabric/sdk/Peer.java @@ -405,7 +405,10 @@ long getReconnectCount() { return reconnectCount; } - void setTLSCertificateKeyPair(TLSCertificateKeyPair tlsCertificateKeyPair) { + synchronized void setTLSCertificateKeyPair(TLSCertificateKeyPair tlsCertificateKeyPair) { + if (properties == null) { + properties = new Properties(); + } properties.put("clientKeyBytes", tlsCertificateKeyPair.getKeyPemBytes()); properties.put("clientCertBytes", tlsCertificateKeyPair.getCertPEMBytes()); diff --git a/src/main/java/org/hyperledger/fabric/sdk/PeerEventServiceClient.java b/src/main/java/org/hyperledger/fabric/sdk/PeerEventServiceClient.java index fed35a0f..101c3515 100644 --- a/src/main/java/org/hyperledger/fabric/sdk/PeerEventServiceClient.java +++ b/src/main/java/org/hyperledger/fabric/sdk/PeerEventServiceClient.java @@ -62,7 +62,6 @@ class PeerEventServiceClient { private final PeerOptions peerOptions; private final boolean filterBlock; private byte[] clientTLSCertificateDigest; - Properties properties = new Properties(); StreamObserver nso = null; StreamObserver so = null; private Channel.ChannelEventQue channelEventQue; @@ -91,7 +90,6 @@ class PeerEventServiceClient { peerEventRegistrationWaitTimeMilliSecs = PEER_EVENT_REGISTRATION_WAIT_TIME; } else { - this.properties = properties; String peerEventRegistrationWaitTime = properties.getProperty("peerEventRegistrationWaitTime", Long.toString(PEER_EVENT_REGISTRATION_WAIT_TIME)); @@ -360,8 +358,6 @@ void peerVent(TransactionContext transactionContext) throws TransactionException start.setNewest(Ab.SeekNewest.getDefaultInstance()); } - // properties. - envelope = createSeekInfoEnvelope(transactionContext, start.build(), Ab.SeekPosition.newBuilder()