FABJ-347 NPE for auto clientcerts

Change-Id: I94dce40d574137725539f8ee4f16dde3d0fdaff6 Signed-off-by: rickr <cr22rc@gmail.com>
hyperledger · Aug 14, 2018 · 4e20ae3 · 4e20ae3
1 parent 3c23a7e
commit 4e20ae3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -62,7 +62,6 @@ class PeerEventServiceClient {
     private final PeerOptions peerOptions;
     private final boolean filterBlock;
     private byte[] clientTLSCertificateDigest;
-    Properties properties = new Properties();
     StreamObserver<Envelope> nso = null;
     StreamObserver<DeliverResponse> 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()