1 files changed, 5 insertions, 3 deletions
diff --git a/tensorflow/java/src/main/java/org/tensorflow/DataType.java b/tensorflow/java/src/main/java/org/tensorflow/DataType.java
index cafa3ffc7d..e67e266ff7 100644
--- a/tensorflow/java/src/main/java/org/tensorflow/DataType.java
+++ b/tensorflow/java/src/main/java/org/tensorflow/DataType.java
@@ -53,12 +53,14 @@ public enum DataType {
   int c() {
     return value;
   }
+  
+  // Cached to avoid copying it
+  final private static DataType[] values = values();
 
   static DataType fromC(int c) {
-    for (DataType t : DataType.values()) {
-      if (t.c() == c) {
+    for (DataType t : values) {
+      if (t.value == c)
         return t;
-      }
     }
     throw new IllegalArgumentException(
         "DataType " + c + " is not recognized in Java (version " + TensorFlow.version() + ")");