From 1480f1371b3c8f614a6bb765f4bad8d1125d6ff1 Mon Sep 17 00:00:00 2001
From: Christian 'ketura' McCarty <hyperlink.teltura@gmail.com>
Date: Thu, 3 Nov 2022 02:40:02 -0500
Subject: [PATCH] Fixing null reference exception when creating table.  Adding
 delayed flush for log to hopefully speed up http requests.

---
 gemp-lotr/gemp-lotr-async/src/main/resources/log4j.xml      | 6 ++++++
 .../main/java/com/gempukku/lotro/db/DbCollectionDAO.java    | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/gemp-lotr/gemp-lotr-async/src/main/resources/log4j.xml b/gemp-lotr/gemp-lotr-async/src/main/resources/log4j.xml
index 7d9e5396e..e538519ce 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/resources/log4j.xml
+++ b/gemp-lotr/gemp-lotr-async/src/main/resources/log4j.xml
@@ -13,6 +13,8 @@
         <param name="MaxBackupIndex" value="20"/>
         <layout class="org.apache.log4j.PatternLayout">
             <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss,SSS} %5p %c{1}:%L - %m%n"/>
+            <param name="immediateFlush" value="false"/>
+            <param name="bufferSize" value="2048"/>
         </layout>
     </appender>
 
@@ -23,6 +25,8 @@
         <param name="MaxBackupIndex" value="20"/>
         <layout class="org.apache.log4j.PatternLayout">
             <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss,SSS} %5p %c{1}:%L - %m%n"/>
+            <param name="immediateFlush" value="false"/>
+            <param name="bufferSize" value="2048"/>
         </layout>
     </appender>
 
@@ -33,6 +37,8 @@
         <param name="MaxBackupIndex" value="1"/>
         <layout class="org.apache.log4j.PatternLayout">
             <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss,SSS} %5p %c{1}:%L - %m%n"/>
+            <param name="immediateFlush" value="false"/>
+            <param name="bufferSize" value="2048"/>
         </layout>
     </appender>
 
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/DbCollectionDAO.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/DbCollectionDAO.java
index b7720c858..c7d3171bb 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/DbCollectionDAO.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/DbCollectionDAO.java
@@ -39,6 +39,9 @@ public class DbCollectionDAO implements CollectionDAO {
     public CardCollection getPlayerCollection(int playerId, String type) throws SQLException, IOException {
 
         var collection = getCollectionInfo(playerId, type);
+        if(collection == null)
+            return null;
+
         var entries = extractCollectionEntries(collection.id);
 
         var result = _collectionSerializer.deserializeCollection(collection, entries);