commit 7ccbdb6f1c030f9715108829db0a1877a9021d8a
author Dmitry Lychagin <dmitry.lychagin@couchbase.com> Fri May 26 16:25:02 2017 -0700
committer Till Westmann <tillw@apache.org> Fri May 26 18:13:09 2017 -0700
tree 0701c780855ac6043b9db57b83e5d6085dac8263
parent 8549db8ad0e4dace6c67a652c6a8bebe157a40bc

Fix potential race condition in ATypeHierarchy

Change-Id: I804ae58571ecdf5829b70073457480c4540657db
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1781
Reviewed-by: Yingyi Bu <buyingyi@gmail.com>
Sonar-Qube: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
BAD: Jenkins <jenkins@fulliautomatix.ics.uci.edu>

asterixdb/asterix-om/src/main/java/org/apache/asterix/om/types/hierachy/ATypeHierarchy.java

diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/types/hierachy/ATypeHierarchy.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/types/hierachy/ATypeHierarchy.java
index 8b43fa8..2893a0c 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/types/hierachy/ATypeHierarchy.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/types/hierachy/ATypeHierarchy.java
@@ -52,7 +52,6 @@
     private static HashMap<Integer, ITypeConvertComputer> promoteComputerMap = new HashMap<Integer, ITypeConvertComputer>();
     private static HashMap<Integer, ITypeConvertComputer> demoteComputerMap = new HashMap<Integer, ITypeConvertComputer>();
     private static Map<ATypeTag, Domain> hierarchyDomains = new HashMap<ATypeTag, Domain>();
-    private static ITypeConvertComputer convertComputer;
 
     // allow type promotion or demotion to the type itself
     static {
@@ -633,11 +632,13 @@
         if (sourceTypeTag != targetTypeTag) {
             // source tag can be promoted to target tag (e.g. tag1: SMALLINT, tag2: INTEGER)
             if (ATypeHierarchy.canPromote(sourceTypeTag, targetTypeTag)) {
-                convertComputer = ATypeHierarchy.getTypePromoteComputer(sourceTypeTag, targetTypeTag);;
+                ITypeConvertComputer convertComputer =
+                        ATypeHierarchy.getTypePromoteComputer(sourceTypeTag, targetTypeTag);
                 convertComputer.convertType(sourceByteArray, s1 + 1, l1 - 1, out);
                 // source tag can be demoted to target tag
             } else if (ATypeHierarchy.canDemote(sourceTypeTag, targetTypeTag)) {
-                convertComputer = ATypeHierarchy.getTypeDemoteComputer(sourceTypeTag, targetTypeTag);;
+                ITypeConvertComputer convertComputer =
+                        ATypeHierarchy.getTypeDemoteComputer(sourceTypeTag, targetTypeTag);
                 convertComputer.convertType(sourceByteArray, s1 + 1, l1 - 1, out);
             } else {
                 throw new IOException(