Ensure the table size is returned only when the table is initialized.

Change: 117166443

1 files changed, 4 insertions, 1 deletions

diff --git a/tensorflow/core/kernels/lookup_table_op.cc b/tensorflow/core/kernels/lookup_table_op.cc
index acaed73bbd..ebbf8aa7aa 100644
--- a/tensorflow/core/kernels/lookup_table_op.cc
+++ b/tensorflow/core/kernels/lookup_table_op.cc
@@ -51,7 +51,10 @@ namespace lookup {
 template <class K, class V>
 class HashTable : public InitializableLookupTable {
  public:
-  size_t size() const override { return table_ ? table_->size() : 0; }
+  size_t size() const override {
+    // return the size of the table only if it's initialized, otherwise 0.
+    return table_ && is_initialized_ ? table_->size() : 0;
+  }
 
   DataType key_dtype() const override { return DataTypeToEnum<K>::v(); }