Merge branch 'develop'

kdgyun · Aug 26, 2023 · 6322305 · 6322305
2 parents 60a5585 + 02de4ed
commit 6322305
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/DataStructure/Java/_09_Heap/Heap.java b/DataStructure/Java/_09_Heap/Heap.java
@@ -166,7 +166,13 @@ public E remove() {
 			throw new NoSuchElementException();
 		}	
 		E result = (E) array[1]; 
-		E target = (E) array[size];
+		E target;
+		if(size == 1) {
+			target = null;
+		}
+		else {
+			target = (E) array[size];
+		}
 		array[size] = null;
 		size--;	
 		siftDown(1, target);	

diff --git a/DataStructure/Java/_10_PriorityQueue/PriorityQueue.java b/DataStructure/Java/_10_PriorityQueue/PriorityQueue.java
@@ -194,7 +194,13 @@ public E remove() {
 		}	
 
 		E result = (E) array[1];
-		E target = (E) array[size];
+		E target;
+		if(size == 1) {
+			target = null;
+		}
+		else {
+			target = (E) array[size];
+		}
 
 		array[size] = null;
 		size--;