Remove empty to avoid class-init deadlock

3 files changed, 2 insertions, 4 deletions

diff --git a/vespajlib/src/main/java/com/yahoo/tensor/IndexedTensor.java b/vespajlib/src/main/java/com/yahoo/tensor/IndexedTensor.java
index a4b1a02f95c..f007db48001 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/IndexedTensor.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/IndexedTensor.java
@@ -156,7 +156,7 @@ public class IndexedTensor implements Tensor {
     @Override
     public Map<TensorAddress, Double> cells() {
         if (dimensionSizes.dimensions() == 0)
-            return Collections.singletonMap(TensorAddress.empty, values[0]);
+            return Collections.singletonMap(TensorAddress.of(), values[0]);
         
         ImmutableMap.Builder<TensorAddress, Double> builder = new ImmutableMap.Builder<>();
         Indexes indexes = Indexes.of(dimensionSizes, dimensionSizes, values.length);
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/TensorAddress.java b/vespajlib/src/main/java/com/yahoo/tensor/TensorAddress.java
index d62e7575358..30eeba8cc4f 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/TensorAddress.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/TensorAddress.java
@@ -22,8 +22,6 @@ import java.util.Set;
 @Beta
 public abstract class TensorAddress implements Comparable<TensorAddress> {
 
-    public static final TensorAddress empty = new TensorAddress.Builder(TensorType.empty).build();
-
     public static TensorAddress of(String[] labels) {
         return new StringTensorAddress(labels);
     }
diff --git a/vespajlib/src/test/java/com/yahoo/tensor/IndexedTensorTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/IndexedTensorTestCase.java
index 09b6e79a101..51d2de6c11f 100644
--- a/vespajlib/src/test/java/com/yahoo/tensor/IndexedTensorTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/tensor/IndexedTensorTestCase.java
@@ -34,7 +34,7 @@ public class IndexedTensorTestCase {
 
     @Test
     public void testSingleValue() {
-        Tensor singleValue = Tensor.Builder.of(TensorType.empty).cell(TensorAddress.empty, 3.5).build();
+        Tensor singleValue = Tensor.Builder.of(TensorType.empty).cell(TensorAddress.of(), 3.5).build();
         assertTrue(singleValue instanceof IndexedTensor);
         assertEquals("{3.5}", singleValue.toString());
         Tensor singleValueFromString = Tensor.from(TensorType.empty, "{3.5}");