From fd166f0ec1cd78d0ee0c3036f3c5b964bd0ae52c Mon Sep 17 00:00:00 2001
From: srinu gajjala <srinu.gajjala321@gmail.com>
Date: Mon, 25 Nov 2024 20:54:59 -0600
Subject: [PATCH 1/2] Simplying the rotate subnets logic

---
 CHANGELOG.md                                      |  5 +++++
 .../process/DataPullRequestProcessor.java         | 15 ++++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb51363..5233f26 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html)
 
+## [0.1.83] - 2024-11-25
+Upgrading the emr label to fix some vulnerabilities.
+### Changed
+-api/src/main/java/com/homeaway/datapullclient/config/DataPullRequestProcessor.java
+
 ## [0.1.82] - 2024-11-06
 Upgrading the emr label to fix some vulnerabilities. 
 ### Changed
diff --git a/api/src/main/java/com/homeaway/datapullclient/process/DataPullRequestProcessor.java b/api/src/main/java/com/homeaway/datapullclient/process/DataPullRequestProcessor.java
index 1c01192..94b26d3 100644
--- a/api/src/main/java/com/homeaway/datapullclient/process/DataPullRequestProcessor.java
+++ b/api/src/main/java/com/homeaway/datapullclient/process/DataPullRequestProcessor.java
@@ -257,15 +257,12 @@ private void runDataPull(String json, boolean isStart, boolean validateJson) thr
             log.debug("runDataPull <- return");
     }
 
-    List<String> rotateSubnets(){
-
-        if(subnets.isEmpty()){
-            subnets= getSubnet();
-        }else{
-            List<String> subnetIds_shuffled = new ArrayList<>(subnets);
-            Collections.rotate(subnetIds_shuffled, 1);
-            subnets.clear();
-            subnets.addAll(subnetIds_shuffled);
+    List<String> rotateSubnets() {
+        if (subnets.isEmpty()) {
+            subnets = getSubnet();
+        } else {
+            String first = subnets.remove(0);
+            subnets.add(first);
         }
         return subnets;
     }

From 0b0cd84ae20626a3f41585832949b20403b41b37 Mon Sep 17 00:00:00 2001
From: srinu gajjala <srinu.gajjala321@gmail.com>
Date: Mon, 25 Nov 2024 21:09:02 -0600
Subject: [PATCH 2/2] Simplying the rotate subnets logic

---
 .../process/DataPullRequestProcessor.java          | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/api/src/main/java/com/homeaway/datapullclient/process/DataPullRequestProcessor.java b/api/src/main/java/com/homeaway/datapullclient/process/DataPullRequestProcessor.java
index 94b26d3..944458f 100644
--- a/api/src/main/java/com/homeaway/datapullclient/process/DataPullRequestProcessor.java
+++ b/api/src/main/java/com/homeaway/datapullclient/process/DataPullRequestProcessor.java
@@ -258,11 +258,15 @@ private void runDataPull(String json, boolean isStart, boolean validateJson) thr
     }
 
     List<String> rotateSubnets() {
-        if (subnets.isEmpty()) {
-            subnets = getSubnet();
-        } else {
-            String first = subnets.remove(0);
-            subnets.add(first);
+        if (subnets == null) {
+            synchronized (subnets) {
+                if (subnets.isEmpty()) {
+                subnets = getSubnet();
+                } else {
+                String first = subnets.remove(0);
+                subnets.add(first);
+                }
+            }
         }
         return subnets;
     }