From eed3bb9cd5b6098f5b06130fa9b5b1deffc67118 Mon Sep 17 00:00:00 2001
From: Aleksei <a.gryczewski999@gmail.com>
Date: Thu, 27 Feb 2020 16:10:14 -0500
Subject: [PATCH] Fixed multiple extraction eating first result

---
 .../database/controllers/OutfitController.java   | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/java/dev/salmonllama/fsbot/database/controllers/OutfitController.java b/src/main/java/dev/salmonllama/fsbot/database/controllers/OutfitController.java
index 34388e0..e583703 100644
--- a/src/main/java/dev/salmonllama/fsbot/database/controllers/OutfitController.java
+++ b/src/main/java/dev/salmonllama/fsbot/database/controllers/OutfitController.java
@@ -262,16 +262,18 @@ public class OutfitController {
 
     private static Optional<Collection<Outfit>> extractMultiple(ResultSet rs) throws SQLException {
         Collection<Outfit> outfits = new ArrayList<>();
-        if (rs.next()) { // I don't see a better way to wrap this. If results exist -> iterate through them, return the optional.
-            while (rs.next()) {
-                outfits.add(mapObject(rs));
-            }
-            FSDB.get().close(rs);
-            return Optional.of(outfits);
+        
+        while (rs.next()) {
+            outfits.add(mapObject(rs));
         }
 
         FSDB.get().close(rs);
-        return Optional.empty();
+
+        if (outfits.size() == 0) {
+            return Optional.empty();
+        }
+        
+        return Optional.of(outfits);
     }
 
     private static Outfit mapObject(ResultSet rs) throws SQLException {