Fixed issue #584 (#586)

hg-ms · zdenek-jonas · commit 850c81859805 · 2023-07-04T10:57:02.000+02:00
Fixed a Nullpointer exception in one.microstream.collections.lazy.LazySegmentUnloader.remove in case of no loaded segments. (cherry picked from commit f036cb5)
diff --git a/base/src/main/java/one/microstream/collections/lazy/LazySegmentUnloader.java b/base/src/main/java/one/microstream/collections/lazy/LazySegmentUnloader.java
@@ -210,7 +210,10 @@ public LazySegmentUnloader copy()
 		@Override
 		public void remove(final LazySegment<?> segment)
 		{
-			this.loadedSegments.remove(segment);
+			if(this.loadedSegments != null)
+			{
+				this.loadedSegments.remove(segment);
+			}
 		}
 		
 	}
@@ -313,7 +316,10 @@ public LazySegmentUnloader copy()
 		@Override
 		public void remove(final LazySegment<?> segment)
 		{
-			this.loadedSegments.remove(segment);
+			if(this.loadedSegments != null)
+			{
+				this.loadedSegments.remove(segment);
+			}
 		}
 				
 	}

Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,10 @@ public LazySegmentUnloader copy()`
`210`	`210`	`@Override`
`211`	`211`	`public void remove(final LazySegment<?> segment)`
`212`	`212`	`{`
`213`		`- this.loadedSegments.remove(segment);`
	`213`	`+ if(this.loadedSegments != null)`
	`214`	`+ {`
	`215`	`+ this.loadedSegments.remove(segment);`
	`216`	`+ }`
`214`	`217`	`}`
`215`	`218`
`216`	`219`	`}`
`@@ -313,7 +316,10 @@ public LazySegmentUnloader copy()`
`313`	`316`	`@Override`
`314`	`317`	`public void remove(final LazySegment<?> segment)`
`315`	`318`	`{`
`316`		`- this.loadedSegments.remove(segment);`
	`319`	`+ if(this.loadedSegments != null)`
	`320`	`+ {`
	`321`	`+ this.loadedSegments.remove(segment);`
	`322`	`+ }`
`317`	`323`	`}`
`318`	`324`
`319`	`325`	`}`