Fix NullPointerException issue. (tensorflow#407)

frankfliu · Craigacp · commit 1e189482d928 · 2022-03-09T19:40:37.000-05:00
diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/EagerOperation.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/EagerOperation.java
@@ -190,9 +190,9 @@ private static Tensor resolveTensorHandle(TFE_TensorHandle handle, EagerSession
     requireTensorHandle(handle);
     try (PointerScope scope = new PointerScope()) {
       TF_Status status = TF_Status.newStatus();
-      TF_Tensor tensor = TFE_TensorHandleResolve(handle, status).withDeallocator();
+      TF_Tensor tensor = TFE_TensorHandleResolve(handle, status);
       status.throwExceptionIfNotOK();
-      return RawTensor.fromHandle(tensor, session).asTypedTensor();
+      return RawTensor.fromHandle(tensor.withDeallocator(), session).asTypedTensor();
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -190,9 +190,9 @@ private static Tensor resolveTensorHandle(TFE_TensorHandle handle, EagerSession`
`190`	`190`	`requireTensorHandle(handle);`
`191`	`191`	`try (PointerScope scope = new PointerScope()) {`
`192`	`192`	`TF_Status status = TF_Status.newStatus();`
`193`		`- TF_Tensor tensor = TFE_TensorHandleResolve(handle, status).withDeallocator();`
	`193`	`+ TF_Tensor tensor = TFE_TensorHandleResolve(handle, status);`
`194`	`194`	`status.throwExceptionIfNotOK();`
`195`		`- return RawTensor.fromHandle(tensor, session).asTypedTensor();`
	`195`	`+ return RawTensor.fromHandle(tensor.withDeallocator(), session).asTypedTensor();`
`196`	`196`	`}`
`197`	`197`	`}`
`198`	`198`