[phoenix] branch 4.x-HBase-1.4 updated: PHOENIX-374: Enable access to dynamic columns in * or cf.* selection (Addendum)

[chinmayskulkarni]

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

chinmayskulkarni pushed a commit to branch 4.x-HBase-1.4
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/4.x-HBase-1.4 by this push:
     new a4e213d  PHOENIX-374: Enable access to dynamic columns in * or cf.* 
selection (Addendum)
a4e213d is described below

commit a4e213de1674ec9d8132e0a3ea173c62c52dfd03
Author: Chinmay Kulkarni <chinmayskulka...@gmail.com>
AuthorDate: Thu Feb 28 15:47:42 2019 -0800

    PHOENIX-374: Enable access to dynamic columns in * or cf.* selection 
(Addendum)
---
 phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java
index 8b71c54..5f499d8 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java
@@ -1291,7 +1291,9 @@ public class PTableImpl implements PTable {
                 }
                 String fam = Bytes.toString(family);
                 if (column.isDynamic()) {
-                    this.colFamToDynamicColumnsMapping.putIfAbsent(fam, new 
ArrayList<PColumn>());
+                    if (!this.colFamToDynamicColumnsMapping.containsKey(fam)) {
+                        this.colFamToDynamicColumnsMapping.put(fam, new 
ArrayList<PColumn>());
+                    }
                     this.colFamToDynamicColumnsMapping.get(fam).add(column);
                 }
             }