Resolve Merge conflicts

Author: RamAnvesh

krystal-common/src/main/java/com/flipkart/krystal/pooling/PartitionedPool.java

@@ -163,10 +163,10 @@ private void tryMakeAvailable(int indexToMakeAvailable) {
 
     PooledObject<T> toMove = partitionedList.get(indexToMakeAvailable);
     PooledObject<T> other = partitionedList.get(unavailableStartIndex);
-    partitionedList.set(indexToMakeAvailable, other);
-    partitionedList.set(unavailableStartIndex, toMove);
     toMove.index(unavailableStartIndex);
     other.index(indexToMakeAvailable);
+    partitionedList.set(other.index(), other);
+    partitionedList.set(toMove.index(), toMove);
     this.unavailableStartIndex++;
   }
 
@@ -180,23 +180,21 @@ private void tryMakeUnavailable(int indexToMakeUnavailable) {
         indexToMakeUnavailable < partitionedList.size(),
         "Index to make unavailable should be < elements.size()");
 
-    final int unavailableStartIndex = this.unavailableStartIndex;
-
     if (indexToMakeUnavailable >= unavailableStartIndex) {
       // This index is already unavailable!
       return;
     }
+    final int newUnavailableStartIndex = this.unavailableStartIndex - 1;
     if (partitionedList.get(indexToMakeUnavailable).activeLeases < hardMaxLeasesPerObject) {
       // Object at index has not reached the hard max leases yet. So it cannot be made unavailable
       return;
     }
     PooledObject<T> toMove = partitionedList.get(indexToMakeUnavailable);
-    int otherIndex = unavailableStartIndex - 1;
-    PooledObject<T> other = partitionedList.get(otherIndex);
-    partitionedList.set(indexToMakeUnavailable, other);
-    partitionedList.set(otherIndex, toMove);
-    toMove.index(unavailableStartIndex);
+    PooledObject<T> other = partitionedList.get(newUnavailableStartIndex);
     other.index(indexToMakeUnavailable);
+    toMove.index(newUnavailableStartIndex);
+    partitionedList.set(other.index(), other);
+    partitionedList.set(toMove.index(), toMove);
     this.unavailableStartIndex--;
   }
 

krystal-common/src/test/java/com/flipkart/krystal/pooling/PartitionedPoolTest.java

@@ -3,6 +3,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.flipkart.krystal.pooling.PartitionedPool.PooledObject;
+import java.util.ArrayList;
+import java.util.List;
 import org.junit.jupiter.api.Test;
 
 class PartitionedPoolTest {
@@ -91,4 +93,39 @@ void closeLease_multipleObjects_makesObjectAvailable() {
       assertThat(partitionedPool.availableCount()).isEqualTo(i + 1);
     }
   }
+
+  @Test
+  void leaseAndCloseLoop() throws LeaseUnavailableException {
+    PartitionedPool<Object> partitionedPool = new PartitionedPool<>(1);
+
+    assertThat(partitionedPool.availableCount()).isEqualTo(0);
+    for (int i = 0; i < 10; i++) {
+      partitionedPool.closeLease(partitionedPool.leaseAndAdd(new Object()));
+    }
+    assertThat(partitionedPool.availableCount()).isEqualTo(10);
+
+    for (int i = 0; i < 10; i++) {
+      PooledObject<Object> leasedObject = partitionedPool.getForLeasing(0);
+      assertThat(partitionedPool.availableCount()).isEqualTo(9);
+      partitionedPool.closeLease(leasedObject);
+      assertThat(partitionedPool.availableCount()).isEqualTo(10);
+    }
+  }
+
+  @Test
+  void leaseLoopAndCloseLoop() throws LeaseUnavailableException {
+    PartitionedPool<Object> partitionedPool = new PartitionedPool<>(1);
+
+    List<PooledObject<Object>> leasedObjects = new ArrayList<>();
+
+    for (int i = 0; i < 10; i++) {
+      leasedObjects.add(partitionedPool.leaseAndAdd(new Object()));
+      assertThat(partitionedPool.availableCount()).isEqualTo(0);
+    }
+    for (int i = 0; i < 10; i++) {
+      assertThat(partitionedPool.availableCount()).isEqualTo(i);
+      partitionedPool.closeLease(leasedObjects.get(i));
+      assertThat(partitionedPool.availableCount()).isEqualTo(i + 1);
+    }
+  }
 }