From 69844417ceae3c84c5d103dde83acfa5a80b3281 Mon Sep 17 00:00:00 2001 From: cola98765 Date: Tue, 14 Dec 2021 18:37:26 +0100 Subject: [PATCH] potential fix to that merge bug --- src/main/java/com/seibel/lod/core/util/DataPointUtil.java | 3 +-- src/main/java/com/seibel/lod/core/util/ThreadMapUtil.java | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/seibel/lod/core/util/DataPointUtil.java b/src/main/java/com/seibel/lod/core/util/DataPointUtil.java index 0a0d52425..81b11c287 100644 --- a/src/main/java/com/seibel/lod/core/util/DataPointUtil.java +++ b/src/main/java/com/seibel/lod/core/util/DataPointUtil.java @@ -378,8 +378,7 @@ public class DataPointUtil //only top is within some exiting block, extending it topPos++; //to make it easier heightAndDepth[topPos * 2] = height; - short temp = heightAndDepth[botPos * 2 + 1]; - heightAndDepth[topPos * 2 + 1] = temp; + heightAndDepth[topPos * 2 + 1] = heightAndDepth[botPos * 2 + 1]; shrinkArray(heightAndDepth, 2, topPos + 1, botPos - topPos, count); count -= botPos - topPos; } diff --git a/src/main/java/com/seibel/lod/core/util/ThreadMapUtil.java b/src/main/java/com/seibel/lod/core/util/ThreadMapUtil.java index f2bc10781..43f2fd078 100644 --- a/src/main/java/com/seibel/lod/core/util/ThreadMapUtil.java +++ b/src/main/java/com/seibel/lod/core/util/ThreadMapUtil.java @@ -178,6 +178,7 @@ public class ThreadMapUtil { heightAndDepthMap.put(Thread.currentThread().getName(), new short[arrayLength]); } + Arrays.fill(heightAndDepthMap.get(Thread.currentThread().getName()), Short.MIN_VALUE); return heightAndDepthMap.get(Thread.currentThread().getName()); }