diff --git service/src/java/org/apache/hive/service/cli/operation/OperationManager.java service/src/java/org/apache/hive/service/cli/operation/OperationManager.java index 96c01de..4c2adc7 100644 --- service/src/java/org/apache/hive/service/cli/operation/OperationManager.java +++ service/src/java/org/apache/hive/service/cli/operation/OperationManager.java @@ -189,7 +189,7 @@ private Operation removeTimedOutOperation(OperationHandle operationHandle) { synchronized (webuiLock) { String opKey = operationHandle.getHandleIdentifier().toString(); SQLOperationDisplay display = liveSqlOperations.remove(opKey); - if (historicSqlOperations != null) { + if (historicSqlOperations != null && display != null) { historicSqlOperations.put(opKey, display); } } @@ -213,7 +213,7 @@ private Operation removeOperation(OperationHandle opHandle) { synchronized (webuiLock) { String opKey = opHandle.getHandleIdentifier().toString(); SQLOperationDisplay display = liveSqlOperations.remove(opKey); - if (historicSqlOperations != null) { + if (historicSqlOperations != null && display != null) { historicSqlOperations.put(opKey, display); } }