|  | @@ -684,8 +684,7 @@ public class Node implements Closeable {
 | 
	
		
			
				|  |  |          transportService.acceptIncomingRequests();
 | 
	
		
			
				|  |  |          discovery.startInitialJoin();
 | 
	
		
			
				|  |  |          final TimeValue initialStateTimeout = DiscoverySettings.INITIAL_STATE_TIMEOUT_SETTING.get(settings);
 | 
	
		
			
				|  |  | -        NodeAndClusterIdStateListener.getAndSetNodeIdAndClusterId(clusterService,
 | 
	
		
			
				|  |  | -            injector.getInstance(ThreadPool.class).getThreadContext());
 | 
	
		
			
				|  |  | +        configureNodeAndClusterIdStateListener(clusterService);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          if (initialStateTimeout.millis() > 0) {
 | 
	
		
			
				|  |  |              final ThreadPool thread = injector.getInstance(ThreadPool.class);
 | 
	
	
		
			
				|  | @@ -737,6 +736,11 @@ public class Node implements Closeable {
 | 
	
		
			
				|  |  |          return this;
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | +    protected void configureNodeAndClusterIdStateListener(ClusterService clusterService) {
 | 
	
		
			
				|  |  | +        NodeAndClusterIdStateListener.getAndSetNodeIdAndClusterId(clusterService,
 | 
	
		
			
				|  |  | +            injector.getInstance(ThreadPool.class).getThreadContext());
 | 
	
		
			
				|  |  | +    }
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |      private Node stop() {
 | 
	
		
			
				|  |  |          if (!lifecycle.moveToStopped()) {
 | 
	
		
			
				|  |  |              return this;
 |