From a6c1e18aef52d2310e1d2497709cfc9ba71cd349 Mon Sep 17 00:00:00 2001
From: Peter Johnson <johnson.peter@gmail.com>
Date: Thu, 5 Oct 2017 23:11:56 -0700
Subject: [PATCH] NetworkTable.containsKey(): Always return false on empty key.

---
 src/main/java/edu/wpi/first/networktables/NetworkTable.java | 2 +-
 src/main/native/cpp/networktables/NetworkTable.cpp          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/edu/wpi/first/networktables/NetworkTable.java b/src/main/java/edu/wpi/first/networktables/NetworkTable.java
index c168ce3e9c..812939fe81 100644
--- a/src/main/java/edu/wpi/first/networktables/NetworkTable.java
+++ b/src/main/java/edu/wpi/first/networktables/NetworkTable.java
@@ -156,7 +156,7 @@ public final class NetworkTable {
    * @return true if the table as a value assigned to the given key
    */
   public boolean containsKey(String key) {
-    return getEntry(key).exists();
+    return !("".equals(key)) && getEntry(key).exists();
   }
 
   /**
diff --git a/src/main/native/cpp/networktables/NetworkTable.cpp b/src/main/native/cpp/networktables/NetworkTable.cpp
index d8f886a670..d351c39302 100644
--- a/src/main/native/cpp/networktables/NetworkTable.cpp
+++ b/src/main/native/cpp/networktables/NetworkTable.cpp
@@ -286,7 +286,7 @@ std::shared_ptr<NetworkTable> NetworkTable::GetSubTable(StringRef key) const {
 }
 
 bool NetworkTable::ContainsKey(StringRef key) const {
-  return GetEntry(key).Exists();
+  return !key.empty() && GetEntry(key).Exists();
 }
 
 bool NetworkTable::ContainsSubTable(StringRef key) const {