[incubator-pulsar] branch master updated: Update logCtx passed to MessageCrypto, removed unused variable (#1177)

[mm...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pulsar.git


The following commit(s) were added to refs/heads/master by this push:
     new d0a4ff3  Update logCtx passed to MessageCrypto, removed unused variable (#1177)
d0a4ff3 is described below

commit d0a4ff3c66ce46e204678df403339e6aeb5352b6
Author: Andrews <sa...@gmail.com>
AuthorDate: Mon Feb 5 13:31:44 2018 -0800

    Update logCtx passed to MessageCrypto, removed unused variable (#1177)
    
    * Update logCtx passed to MessageCrypto, removed unused variable
    
    * Check cryptoKeyReader is not null to confirm if encryption is enabled
---
 pulsar-client-cpp/lib/MessageCrypto.cc                                 | 1 -
 .../main/java/org/apache/pulsar/client/api/ProducerConfiguration.java  | 2 +-
 .../src/main/java/org/apache/pulsar/client/impl/MessageCrypto.java     | 3 ++-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pulsar-client-cpp/lib/MessageCrypto.cc b/pulsar-client-cpp/lib/MessageCrypto.cc
index 5e3bd3c..26f1b48 100644
--- a/pulsar-client-cpp/lib/MessageCrypto.cc
+++ b/pulsar-client-cpp/lib/MessageCrypto.cc
@@ -193,7 +193,6 @@ bool MessageCrypto::encrypt(std::set<std::string>& encKeys, const CryptoKeyReade
     if (!encKeys.size()) {
         return false;
     }
-    SharedBuffer emptyBuffer;
 
     Lock lock(mutex_);
 
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/api/ProducerConfiguration.java b/pulsar-client/src/main/java/org/apache/pulsar/client/api/ProducerConfiguration.java
index 678e3d5..9bde4c8 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/api/ProducerConfiguration.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/api/ProducerConfiguration.java
@@ -344,7 +344,7 @@ public class ProducerConfiguration implements Serializable {
      *
      */
     public boolean isEncryptionEnabled() {
-        return (this.encryptionKeys != null) && !this.encryptionKeys.isEmpty();
+        return (this.encryptionKeys != null) && !this.encryptionKeys.isEmpty() && (this.cryptoKeyReader != null);
     }
 
     /**
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MessageCrypto.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MessageCrypto.java
index 7df8bb2..38d6a58 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MessageCrypto.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MessageCrypto.java
@@ -129,6 +129,7 @@ public class MessageCrypto {
 
     public MessageCrypto(String logCtx, boolean keyGenNeeded) {
 
+        this.logCtx = logCtx;
         encryptedDataKeyMap = new ConcurrentHashMap<String, EncryptionKeyInfo>();
         dataKeyCache = CacheBuilder.newBuilder().expireAfterAccess(4, TimeUnit.HOURS)
                 .build(new CacheLoader<ByteBuffer, SecretKey>() {
@@ -471,7 +472,7 @@ public class MessageCrypto {
             return false;
         }
 
-        // Generate a data key to encrypt messages
+        // Decrypt data key to decrypt messages
         Cipher dataKeyCipher = null;
         byte[] dataKeyValue = null;
         byte[] keyDigest = null;

-- 
To stop receiving notification emails like this one, please contact
mmerli@apache.org.