1 files changed, 5 insertions, 5 deletions

diff --git a/messagebus/src/main/java/com/yahoo/messagebus/MessageBus.java b/messagebus/src/main/java/com/yahoo/messagebus/MessageBus.java
index 0f0b704bba7..26e61e8917b 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/MessageBus.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/MessageBus.java
@@ -58,13 +58,13 @@ public class MessageBus implements ConfigHandler, NetworkOwner, MessageHandler,
     private static Logger log = Logger.getLogger(MessageBus.class.getName());
     private final AtomicBoolean destroyed = new AtomicBoolean(false);
     private final ProtocolRepository protocolRepository = new ProtocolRepository();
-    private final AtomicReference<Map<String, RoutingTable>> tablesRef = new AtomicReference<>(null);
-    private final CopyOnWriteHashMap<String, MessageHandler> sessions = new CopyOnWriteHashMap<>();
+    private final AtomicReference<Map<String, RoutingTable>> tablesRef = new AtomicReference<Map<String, RoutingTable>>(null);
+    private final CopyOnWriteHashMap<String, MessageHandler> sessions = new CopyOnWriteHashMap<String, MessageHandler>();
     private final Network net;
     private final Messenger msn;
     private final Resender resender;
-    private int maxPendingCount;
-    private int maxPendingSize;
+    private int maxPendingCount = 0;
+    private int maxPendingSize = 0;
     private int pendingCount = 0;
     private int pendingSize = 0;
     private final Thread careTaker = new Thread(this::sendBlockedMessages);
@@ -440,7 +440,7 @@ public class MessageBus implements ConfigHandler, NetworkOwner, MessageHandler,
 
     @Override
     public void setupRouting(RoutingSpec spec) {
-        Map<String, RoutingTable> tables = new HashMap<>();
+        Map<String, RoutingTable> tables = new HashMap<String, RoutingTable>();
         for (int i = 0, len = spec.getNumTables(); i < len; ++i) {
             RoutingTableSpec table = spec.getTable(i);
             String name = table.getProtocol();