Merge branch 'fix-standard-offering-creation' into '4.20.0.0-scclouds'

Corrige criação da oferta de backup nativo Standard

See merge request scclouds/scclouds!1328

Author: Fabrício Duarte

engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade42005to42006.java

@@ -91,10 +91,11 @@ private void normalizeBackupOfferingsIfNeeded(Connection conn) {
         String uuid;
         try (PreparedStatement pstmt = conn.prepareStatement(SELECT_NATIVE_OFFERING)) {
             ResultSet result = pstmt.executeQuery();
-            if (!result.next()) {
-                result = createStandardOffering(conn);
+            if (result.next()) {
+                uuid = result.getString("uuid");
+            } else {
+                uuid = createStandardOffering(conn);
             }
-            uuid = result.getString("uuid");
         } catch (SQLException e) {
             String message = String.format("Unable to retrieve Standard native backup offering due to [%s].", e.getMessage());
             logger.error(message, e);
@@ -122,7 +123,7 @@ private void normalizeBackupOfferingsIfNeeded(Connection conn) {
         }
     }
 
-    private ResultSet createStandardOffering(Connection conn) {
+    private String createStandardOffering(Connection conn) {
         logger.warn("Found backup offerings that are inconsistent, but the Standard native backup offering does not exist. Will create it again.");
         try (PreparedStatement pstmt = conn.prepareStatement(INSERT_OFFERING)) {
             pstmt.executeUpdate();
@@ -139,7 +140,7 @@ private ResultSet createStandardOffering(Connection conn) {
                 logger.error(message);
                 throw new CloudRuntimeException(message);
             }
-            return resultSet;
+            return resultSet.getString("uuid");
         } catch (SQLException e) {
             String message = String.format("Unable to retrieve native backup offering due to [%s].", e.getMessage());
             logger.error(message, e);