[phoenix] branch 4.x-HBase-1.3 updated: PHOENIX-5345 PartialCommitIT fails in 4.x-HBase-1.3.

[larsh]

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

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


The following commit(s) were added to refs/heads/4.x-HBase-1.3 by this push:
     new 160d56b  PHOENIX-5345 PartialCommitIT fails in 4.x-HBase-1.3.
160d56b is described below

commit 160d56b14d435ba6afbbfe179eab4951b868dc29
Author: Lars Hofhansl <la...@apache.org>
AuthorDate: Fri Jun 28 13:38:52 2019 -0700

    PHOENIX-5345 PartialCommitIT fails in 4.x-HBase-1.3.
---
 .../main/java/org/apache/phoenix/iterate/ScanningResultIterator.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/ScanningResultIterator.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/ScanningResultIterator.java
index 1a3d073..8f98f56 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/ScanningResultIterator.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/ScanningResultIterator.java
@@ -98,6 +98,8 @@ public class ScanningResultIterator implements ResultIterator 
{
 
         if (scanMetricsEnabled && !scanMetricsUpdated) {
             ScanMetrics scanMetrics = scan.getScanMetrics();
+            if (scanMetrics == null)
+                return; // See PHOENIX-5345
             Map<String, Long> scanMetricsMap = scanMetrics.getMetricsMap();
             scanMetricsHolder.setScanMetricMap(scanMetricsMap);