You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by bh...@apache.org on 2019/03/23 16:43:55 UTC
[hadoop] branch trunk updated: HDDS-1331. In DatanodeStateMachine
join check for not null.
This is an automated email from the ASF dual-hosted git repository.
bharat pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 128dd91 HDDS-1331. In DatanodeStateMachine join check for not null.
128dd91 is described below
commit 128dd91e10080bdcbcd7d555fa3c4105e55a6b51
Author: Bharat Viswanadham <bh...@apache.org>
AuthorDate: Sat Mar 23 09:43:49 2019 -0700
HDDS-1331. In DatanodeStateMachine join check for not null.
---
.../container/common/statemachine/DatanodeStateMachine.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/DatanodeStateMachine.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/DatanodeStateMachine.java
index a4ea31e..8d2df2c 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/DatanodeStateMachine.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/DatanodeStateMachine.java
@@ -363,8 +363,13 @@ public class DatanodeStateMachine implements Closeable {
* @throws InterruptedException
*/
public void join() throws InterruptedException {
- stateMachineThread.join();
- cmdProcessThread.join();
+ if (stateMachineThread != null) {
+ stateMachineThread.join();
+ }
+
+ if (cmdProcessThread != null) {
+ cmdProcessThread.join();
+ }
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org