From 87049d0d2950c444d3b855d8b5de681cb824905b Mon Sep 17 00:00:00 2001
From: Shay Banon <kimchy@gmail.com>
Date: Thu, 1 Sep 2011 19:18:28 +0300
Subject: [PATCH] initialize the transport adapter on creation so asking for
 stats will not NPE

---
 .../java/org/elasticsearch/transport/TransportService.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportService.java
index 5639fc678a3..92390bd1654 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportService.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/transport/TransportService.java
@@ -70,7 +70,7 @@ public class TransportService extends AbstractLifecycleComponent<TransportServic
     });
 
     private boolean throwConnectException = false;
-    private TransportService.Adapter adapter;
+    private final TransportService.Adapter adapter = new Adapter();
 
     public TransportService(Transport transport, ThreadPool threadPool) {
         this(EMPTY_SETTINGS, transport, threadPool);
@@ -83,8 +83,8 @@ public class TransportService extends AbstractLifecycleComponent<TransportServic
     }
 
     @Override protected void doStart() throws ElasticSearchException {
-        // register us as an adapter for the transport service
-        adapter = new Adapter();
+        adapter.rxMetric.clear();
+        adapter.txMetric.clear();
         transport.transportServiceAdapter(adapter);
         transport.start();
         if (transport.boundAddress() != null && logger.isInfoEnabled()) {