From 3eff7714a158ec54f7388f7052b0d787230f3bed Mon Sep 17 00:00:00 2001
From: Yohann0617 <852221040@qq.com>
Date: Sat, 8 Feb 2025 22:01:06 +0800
Subject: [PATCH] subnet bug fix

---
 .../config/OracleInstanceFetcher.java         | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/yohann/ocihelper/config/OracleInstanceFetcher.java b/src/main/java/com/yohann/ocihelper/config/OracleInstanceFetcher.java
index 63775ac..5f360d7 100644
--- a/src/main/java/com/yohann/ocihelper/config/OracleInstanceFetcher.java
+++ b/src/main/java/com/yohann/ocihelper/config/OracleInstanceFetcher.java
@@ -156,16 +156,20 @@ synchronized public InstanceDetailDTO createInstanceData() {
                                 subnet = createSubnet(virtualNetworkClient, compartmentId, availableDomain,
                                         getCidr(virtualNetworkClient, compartmentId), vcn);
                             } else {
-                                for (Subnet subnetExist : subnets) {
-                                    if (null == subnetExist.getAvailabilityDomain()) {
-                                        subnet = subnetExist;
-                                        break;
+                                if (!listInstances().isEmpty()) {
+                                    subnet = subnets.get(0);
+                                } else {
+                                    for (Subnet subnetExist : subnets) {
+                                        if (null == subnetExist.getAvailabilityDomain()) {
+                                            subnet = subnetExist;
+                                            break;
+                                        }
+                                    }
+                                    if (null == subnet) {
+                                        subnets.forEach(this::deleteSubnet);
+                                        subnet = createSubnet(virtualNetworkClient, compartmentId, availableDomain,
+                                                getCidr(virtualNetworkClient, compartmentId), vcn);
                                     }
-                                }
-                                if (null == subnet) {
-                                    subnets.forEach(this::deleteSubnet);
-                                    subnet = createSubnet(virtualNetworkClient, compartmentId, availableDomain,
-                                            getCidr(virtualNetworkClient, compartmentId), vcn);
                                 }
                             }
                             log.info("【开机任务】用户：[{}] ，区域：[{}] ，系统架构：[{}] ，检测到VCN：{} 存在，默认使用该VCN创建实例......",