[qpid-jms] branch master updated: QPIDJMS-498: ensure props inserted first, ensuring they are populated if the previous class lookup succeeded

[robbie]

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

robbie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-jms.git


The following commit(s) were added to refs/heads/master by this push:
     new 1c94188  QPIDJMS-498: ensure props inserted first, ensuring they are 
populated if the previous class lookup succeeded
1c94188 is described below

commit 1c94188c417f5cbd9053a5c05d535632c265a08c
Author: Robbie Gemmell <rob...@apache.org>
AuthorDate: Mon Apr 20 16:57:39 2020 +0100

    QPIDJMS-498: ensure props inserted first, ensuring they are populated if 
the previous class lookup succeeded
---
 .../src/main/java/org/apache/qpid/jms/util/FactoryFinder.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/FactoryFinder.java 
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/FactoryFinder.java
index 9fbcc5a..f73a76e 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/FactoryFinder.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/FactoryFinder.java
@@ -170,14 +170,14 @@ public class FactoryFinder<T extends Object> {
             if (clazz == null) {
                 properties = loadProperties(path);
                 clazz = loadClass(properties);
-                Class<?> previousClass = classMap.putIfAbsent(path, clazz);
                 Properties previousProperties = 
propertiesMap.putIfAbsent(path, properties);
-                if (previousClass != null) {
-                    clazz = previousClass;
-                }
                 if (previousProperties != null) {
                     properties = previousProperties;
                 }
+                Class<?> previousClass = classMap.putIfAbsent(path, clazz);
+                if (previousClass != null) {
+                    clazz = previousClass;
+                }
             }
 
             Object factory = clazz.getDeclaredConstructor().newInstance();


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org