aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/core/kernels/lookup_table_op.h
diff options
context:
space:
mode:
authorGravatar Derek Murray <mrry@google.com>2018-08-18 13:21:15 -0700
committerGravatar TensorFlower Gardener <gardener@tensorflow.org>2018-08-18 13:25:33 -0700
commit424ce99f4357515f0f9e57b7a087194cf46134d6 (patch)
treea2d846c583d0ae852b65cc407cc2ebaedb76cc5b /tensorflow/core/kernels/lookup_table_op.h
parent5b63ee85acc0676a35252c50014a178b55aabaa4 (diff)
Do not CHECK-fail in the LookupTableOp destructor.
Like other resource kernels, it is benign if deleting the lookup table resource fails, e.g. because it has already been deleted by a Session::Reset(). PiperOrigin-RevId: 209286478
Diffstat (limited to 'tensorflow/core/kernels/lookup_table_op.h')
-rw-r--r--tensorflow/core/kernels/lookup_table_op.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/tensorflow/core/kernels/lookup_table_op.h b/tensorflow/core/kernels/lookup_table_op.h
index 3977f16299..35ca2b9ad0 100644
--- a/tensorflow/core/kernels/lookup_table_op.h
+++ b/tensorflow/core/kernels/lookup_table_op.h
@@ -102,9 +102,12 @@ class LookupTableOp : public OpKernel {
~LookupTableOp() override {
// If the table object was not shared, delete it.
if (table_handle_set_ && cinfo_.resource_is_private_to_kernel()) {
- TF_CHECK_OK(
- cinfo_.resource_manager()->template Delete<lookup::LookupInterface>(
- cinfo_.container(), cinfo_.name()));
+ if (!cinfo_.resource_manager()
+ ->template Delete<lookup::LookupInterface>(cinfo_.container(),
+ cinfo_.name())
+ .ok()) {
+ // Do nothing; the resource can have been deleted by session resets.
+ }
}
}