Merge branch 'akbar1214-fix-message-drop-issue'

Author: belaban

src/org/jgroups/protocols/ASYM_ENCRYPT.java

@@ -551,10 +551,12 @@ protected void initKeyPair() throws Exception {
 
     protected void createNewKey(String message) {
         try {
+            // cache the previous group key before overwriting it, so that messages still in flight (encrypted with
+            // the old key) can be decrypted after the rotation
+            cacheGroupKey(secret_key, sym_version);
             this.secret_key=createSecretKey();
             initSymCiphers(sym_algorithm, secret_key);
             log.debug("%s: created new group key (version: %s) %s", local_addr, Util.byteArrayToHexString(sym_version), message);
-            cacheGroupKey(sym_version);
         }
         catch(Exception ex) {
             log.error("%s: failed creating group key and initializing ciphers: %s", local_addr, ex);
@@ -570,17 +572,19 @@ protected synchronized void installSharedGroupKey(Address sender, SecretKey key,
         }
         log.debug("%s: installing group key received from %s (version: %s)",
                   local_addr, sender != null? sender : "key exchange protocol", Util.byteArrayToHexString(version));
+        // cache the previous group key before overwriting it, so that messages still in flight (encrypted with
+        // the old key) can be decrypted after the key change
+        cacheGroupKey(secret_key, sym_version);
         secret_key=key;
         initSymCiphers(sym_algorithm, key);
         sym_version=version;
-        cacheGroupKey(version);
     }
 
-    /** Cache the current shared key to decrypt messages encrypted with the old shared group key */
-    protected void cacheGroupKey(byte[] version) throws Exception {
-        // put the previous key into the map
-        if(secret_key != null)
-            key_map.putIfAbsent(new AsciiString(version), secret_key);
+    /** Caches a group key (key, version) so that messages encrypted with a previous group key can still be decrypted
+     * after a key rotation */
+    protected void cacheGroupKey(Key key, byte[] version) {
+        if(key != null && version != null)
+            key_map.putIfAbsent(new AsciiString(version), key);
     }
 
     /** Encrypts the current secret key with the requester's public key (the requester will decrypt it with its private key) */

tests/junit-functional/org/jgroups/protocols/ASYM_ENCRYPT_LeaveTest.java

@@ -29,11 +29,6 @@ public class ASYM_ENCRYPT_LeaveTest extends BaseLeaveTest {
         super.destroy();
     }
 
-    /** For some obscure TestNG reasons, this method is needed. Remove it and all tests are executed in separate threads,
-     * which makes the testsuite fail!!! */
-    public void dummy() {}
-
-
     /** Creates a channel with a config similar to ./conf/asym-ssl.xml */
     protected JChannel create(String name) throws Exception {
         return new JChannel(

tests/junit-functional/org/jgroups/protocols/ASYM_ENCRYPT_Test.java

@@ -48,10 +48,6 @@ public class ASYM_ENCRYPT_Test extends EncryptTest {
         super.destroy();
     }
 
-    /** For some obscure TestNG reasons, this method is needed. Remove it and all tests are executed in separate threads,
-     * which makes the testsuite fail!!! */
-    public void dummy() {}
-
 
 
     /** Verifies that a non-member (non-coord) cannot send a JOIN-RSP to a member */

tests/junit-functional/org/jgroups/protocols/ASYM_ENCRYPT_TestKeyExchange.java

@@ -13,11 +13,6 @@ public class ASYM_ENCRYPT_TestKeyExchange extends ASYM_ENCRYPT_Test {
 
     @Override protected boolean useExternalKeyExchange() {return true;}
 
-    /** For some obscure TestNG reasons, this method is needed. Remove it and all tests are executed in separate threads,
-     * which makes the testsuite fail!!! */
-    public void dummy() {}
-
-
     @AfterMethod
     protected void destroy() {
         super.destroy();

tests/junit-functional/org/jgroups/protocols/SYM_ENCRYPT_Test.java

@@ -33,11 +33,6 @@ public class SYM_ENCRYPT_Test extends EncryptTest {
         super.destroy();
     }
 
-    /** For some obscure TestNG reasons, this method is needed. Remove it and all tests are executed in separate threads,
-     * which makes the testsuite fail!!! */
-    public void dummy() {}
-
-
     @Override protected JChannel create(String name, Consumer<List<Protocol>> c) throws Exception {
         // Verify that the SecureRandom instance can be customized
         SecureRandom secureRandom = SecureRandom.getInstance("SHA1PRNG");

tests/junit-functional/org/jgroups/tests/LeaveTest.java

@@ -22,10 +22,6 @@ public class LeaveTest extends BaseLeaveTest  {
         super.destroy();
     }
 
-    /** For some obscure TestNG reasons, this method is needed. Remove it and all tests are executed in separate threads,
-     * which makes the testsuite fail!!! */
-    public void dummy() {}
-
     protected JChannel create(String name) throws Exception {
         return new JChannel(
           new SHARED_LOOPBACK(),