DB connection close rework.

L2_GameServer/java/com/l2jserver/L2DatabaseFactory.java

@@ -261,6 +261,21 @@ public class L2DatabaseFactory
 		}
 	}
 	
+	public static void close(Connection con)
+	{
+		if (con == null)
+			return;
+		
+		try
+		{
+			con.close();
+		}
+		catch (SQLException e)
+		{
+			_log.log(Level.WARNING, "Failed to close database connection!", e);
+		}
+	}
+	
 	public int getBusyConnectionCount() throws SQLException
 	{
 		return _source.getNumBusyConnectionsDefaultUser();

L2_GameServer/java/com/l2jserver/accountmanager/SQLAccountManager.java

@@ -175,7 +175,7 @@ public class SQLAccountManager
 		}
 		rset.close();
 		statement.close();
-		con.close();
+		L2DatabaseFactory.close(con);
 		System.out.println("Displayed accounts: " + count + ".");
 	}
 	
@@ -196,7 +196,7 @@ public class SQLAccountManager
 		statement.setString(3, level);
 		statement.executeUpdate();
 		statement.close();
-		con.close();
+		L2DatabaseFactory.close(con);
 	}
 	
 	private static void changeAccountLevel(String account, String level) throws SQLException
@@ -231,7 +231,7 @@ public class SQLAccountManager
 		}
 		rset.close();
 		statement.close();
-		con.close();
+		L2DatabaseFactory.close(con);
 	}
 	
 	private static void deleteAccount(String account) throws SQLException
@@ -458,7 +458,7 @@ public class SQLAccountManager
 		
 		// Close Connection
 		statement.close();
-		con.close();
+		L2DatabaseFactory.close(con);
 	}
 	
 }

L2_GameServer/java/com/l2jserver/gameserver/SevenSigns.java

@@ -800,6 +800,7 @@ public class SevenSigns
 				
 				_lastSave.setTimeInMillis(rset.getLong("date"));
 			}
+			statement.close();
 		}
 		catch (SQLException e)
 		{
@@ -807,16 +808,7 @@ public class SevenSigns
 		}
 		finally
 		{
-			try
-			{
-				statement.close();
-			}
-			catch (Exception e) {}
-			try
-			{
-				con.close();
-			}
-			catch (Exception e) {}
+			L2DatabaseFactory.close(con);
 		}
 		
 		// Festival data is loaded now after the Seven Signs engine data.
@@ -855,7 +847,7 @@ public class SevenSigns
 				statement.setDouble(7, sevenDat.getDouble("contribution_score"));
 				statement.setInt(8, sevenDat.getInteger("charId"));
 				statement.execute();
-				
+				statement.close();
 				if (Config.DEBUG)
 					_log.info("SevenSigns: Updated data in database for char ID " + sevenDat.getInteger("charId") + " (" + sevenDat.getString("cabal") + ")");
 			}
@@ -866,16 +858,7 @@ public class SevenSigns
 		}
 		finally
 		{
-			try
-			{
-				statement.close();
-			}
-			catch (Exception e) {}
-			try
-			{
-				con.close();
-			}
-			catch (Exception e) {}
+			L2DatabaseFactory.close(con);
 		}
 	}
 
@@ -901,6 +884,7 @@ public class SevenSigns
 			statement.setDouble(7, sevenDat.getDouble("contribution_score"));
 			statement.setInt(8, sevenDat.getInteger("charId"));
 			statement.execute();
+			statement.close();
 		}
 		catch (SQLException e)
 		{
@@ -908,16 +892,7 @@ public class SevenSigns
 		}
 		finally
 		{
-			try
-			{
-				statement.close();
-			}
-			catch (Exception e) {}
-			try
-			{
-				con.close();
-			}
-			catch (Exception e) {}
+			L2DatabaseFactory.close(con);
 		}
 	}
 
@@ -954,7 +929,7 @@ public class SevenSigns
 			_lastSave = Calendar.getInstance();
 			statement.setLong(18 + SevenSignsFestival.FESTIVAL_COUNT, _lastSave.getTimeInMillis());
 			statement.execute();
-
+			statement.close();
 			if (Config.DEBUG)
 				_log.info("SevenSigns: Updated data in database.");				
 		}
@@ -964,16 +939,7 @@ public class SevenSigns
 		}
 		finally
 		{
-			try
-			{
-				statement.close();
-			}
-			catch (Exception e) {}
-			try
-			{
-				con.close();
-			}
-			catch (Exception e) {}
+			L2DatabaseFactory.close(con);
 		}
 	}
 
@@ -1054,7 +1020,6 @@ public class SevenSigns
 				statement.execute();
 				
 				statement.close();
-				con.close();
 				
 				if (Config.DEBUG)
 					_log.info("SevenSigns: Inserted data in DB for char ID " + currPlayerData.getInteger("charId") + " ("
@@ -1066,14 +1031,7 @@ public class SevenSigns
 			}
 			finally
 			{
-				try
-				{
-					statement.close();
-					con.close();
-				}
-				catch (Exception e)
-				{
-				}
+				L2DatabaseFactory.close(con);
 			}
 		}
 		

L2_GameServer/java/com/l2jserver/gameserver/SevenSignsFestival.java

@@ -1008,13 +1008,7 @@ public class SevenSignsFestival implements SpawnListener
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (SQLException e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -1079,7 +1073,6 @@ public class SevenSignsFestival implements SpawnListener
 			}
 			statementUpdate.close();
 			statementInsert.close();
-			con.close();
 			
 			// Updates Seven Signs DB data also, so call only if really necessary.
 			if (updateSettings)
@@ -1091,13 +1084,7 @@ public class SevenSignsFestival implements SpawnListener
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -1198,13 +1185,7 @@ public class SevenSignsFestival implements SpawnListener
 			}
 			finally
 			{
-				try
-				{
-					con.close();
-				}
-				catch (Exception e)
-				{
-				}
+				L2DatabaseFactory.close(con);
 			}
 		}
 	}

L2_GameServer/java/com/l2jserver/gameserver/TradeController.java

@@ -166,13 +166,7 @@ public class TradeController
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		
 		/*
@@ -274,13 +268,7 @@ public class TradeController
 			}
 			finally
 			{
-				try
-				{
-					con.close();
-				}
-				catch (Exception e)
-				{
-				}
+				L2DatabaseFactory.close(con);
 			}
 		}
 	}
@@ -343,13 +331,7 @@ public class TradeController
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	

L2_GameServer/java/com/l2jserver/gameserver/cache/CrestCache.java

@@ -172,13 +172,7 @@ public class CrestCache
 				}
 				finally
 				{
-					try
-					{
-						con.close();
-					}
-					catch (Exception e)
-					{
-					}
+					L2DatabaseFactory.close(con);
 				}
 				
 				clan.setCrestId(newId);

L2_GameServer/java/com/l2jserver/gameserver/communitybbs/BB/Forum.java

@@ -129,13 +129,7 @@ public class Forum
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		try
 		{
@@ -162,13 +156,7 @@ public class Forum
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -200,13 +188,7 @@ public class Forum
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		
 	}
@@ -301,13 +283,7 @@ public class Forum
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	

L2_GameServer/java/com/l2jserver/gameserver/communitybbs/BB/Post.java

@@ -88,13 +88,7 @@ public class Post
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 
 	}
@@ -135,13 +129,7 @@ public class Post
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	/**
@@ -178,13 +166,7 @@ public class Post
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	/**
@@ -211,22 +193,7 @@ public class Post
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
-
 	}
-	/**
-	 *
-	 */
-
-
-
-
-
 }

L2_GameServer/java/com/l2jserver/gameserver/communitybbs/BB/Topic.java

@@ -97,13 +97,7 @@ public class Topic
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		
 	}
@@ -163,13 +157,7 @@ public class Topic
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	

L2_GameServer/java/com/l2jserver/gameserver/communitybbs/Manager/ForumsBBSManager.java

@@ -66,13 +66,7 @@ public class ForumsBBSManager extends BaseBBSManager
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	

L2_GameServer/java/com/l2jserver/gameserver/datatables/AccessLevels.java

@@ -165,14 +165,7 @@ public class AccessLevels
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-				
-			}
+			L2DatabaseFactory.close(con);
 		}
 		_log.info("AccessLevels: Loaded " + _accessLevels.size() + " from database.");
 	}

L2_GameServer/java/com/l2jserver/gameserver/datatables/AdminCommandAccessRights.java

@@ -87,13 +87,7 @@ public class AdminCommandAccessRights
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		
 		_log.info("AdminCommandAccessRights: Loaded " + _adminCommandAccessRights.size() + " from database.");

L2_GameServer/java/com/l2jserver/gameserver/datatables/ArmorSetsTable.java

@@ -90,13 +90,7 @@ public class ArmorSetsTable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		if (Config.CUSTOM_ARMORSETS_TABLE)
 		{
@@ -132,13 +126,7 @@ public class ArmorSetsTable
 			}
 			finally
 			{
-				try
-				{
-					con.close();
-				}
-				catch (Exception e)
-				{
-				}
+				L2DatabaseFactory.close(con);
 			}
 		}
 	}

L2_GameServer/java/com/l2jserver/gameserver/datatables/CharNameTable.java

@@ -113,6 +113,7 @@ public class CharNameTable
 				accessLevel = rset.getInt(2);
 			}
 			rset.close();
+			statement.close();
 		}
 		catch (SQLException e)
 		{
@@ -120,16 +121,7 @@ public class CharNameTable
 		}
 		finally
 		{
-			try
-			{
-				statement.close();
-			}
-			catch (Exception e) {}
-			try
-			{
-				con.close();
-			}
-			catch (Exception e) {}
+			L2DatabaseFactory.close(con);
 		}
 		if (id > 0)
 		{
@@ -168,6 +160,7 @@ public class CharNameTable
 				accessLevel = rset.getInt(2);
 			}
 			rset.close();
+			statement.close();
 		}
 		catch (SQLException e)
 		{
@@ -175,16 +168,7 @@ public class CharNameTable
 		}
 		finally
 		{
-			try
-			{
-				statement.close();
-			}
-			catch (Exception e) {}
-			try
-			{
-				con.close();
-			}
-			catch (Exception e) {}
+			L2DatabaseFactory.close(con);
 		}
 		if (name != null && !name.isEmpty())
 		{
@@ -225,13 +209,7 @@ public class CharNameTable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		return result;
 	}
@@ -260,13 +238,7 @@ public class CharNameTable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		
 		return number;
@@ -293,6 +265,7 @@ public class CharNameTable
 				_accessLevels.put(id, accessLevel);
 			}
 			rset.close();
+			statement.close();
 		}
 		catch (SQLException e)
 		{
@@ -300,18 +273,7 @@ public class CharNameTable
 		}
 		finally
 		{
-			try
-			{
-				statement.close();
-			}
-			catch (Exception e)
-			{}
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	

L2_GameServer/java/com/l2jserver/gameserver/datatables/CharTemplateTable.java

@@ -119,14 +119,7 @@ public class CharTemplateTable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-				// nothing
-			}
+			L2DatabaseFactory.close(con);
 		}
 		
 		try
@@ -178,14 +171,7 @@ public class CharTemplateTable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-				// nothing
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	

L2_GameServer/java/com/l2jserver/gameserver/datatables/ClanTable.java

@@ -107,13 +107,7 @@ public class ClanTable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		
 		restorewars();
@@ -320,13 +314,7 @@ public class ClanTable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -386,13 +374,7 @@ public class ClanTable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		//SystemMessage msg = new SystemMessage(SystemMessageId.WAR_WITH_THE_S1_CLAN_HAS_BEGUN);
 		//
@@ -448,13 +430,7 @@ public class ClanTable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		//SystemMessage msg = new SystemMessage(SystemMessageId.WAR_WITH_THE_S1_CLAN_HAS_ENDED);
 		SystemMessage msg = new SystemMessage(SystemMessageId.WAR_AGAINST_S1_HAS_STOPPED);
@@ -506,13 +482,7 @@ public class ClanTable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	

L2_GameServer/java/com/l2jserver/gameserver/datatables/EnchantGroupsTable.java

@@ -125,13 +125,7 @@ public class EnchantGroupsTable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		
 		_log.info("EnchantGroupsTable: Loaded " + count + " groups.");

L2_GameServer/java/com/l2jserver/gameserver/datatables/FishTable.java

@@ -94,13 +94,7 @@ public class FishTable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		_log.info("FishTable: Loaded " + count + " Fishes.");
 	}

L2_GameServer/java/com/l2jserver/gameserver/datatables/HelperBuffTable.java

@@ -93,13 +93,7 @@ public class HelperBuffTable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	

L2_GameServer/java/com/l2jserver/gameserver/datatables/HennaTable.java

@@ -70,13 +70,7 @@ public class HennaTable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	

L2_GameServer/java/com/l2jserver/gameserver/datatables/HennaTreeTable.java

@@ -114,13 +114,7 @@ public class HennaTreeTable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	

L2_GameServer/java/com/l2jserver/gameserver/datatables/ItemTable.java

@@ -274,13 +274,7 @@ public class ItemTable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		
 		if (Config.CUSTOM_ITEM_TABLES)
@@ -334,13 +328,7 @@ public class ItemTable
 			}
 			finally
 			{
-				try
-				{
-					con.close();
-				}
-				catch (Exception e)
-				{
-				}
+				L2DatabaseFactory.close(con);
 			}
 		}
 		
@@ -974,13 +962,7 @@ public class ItemTable
 				}
 				finally
 				{
-					try
-					{
-						con.close();
-					}
-					catch (Exception e)
-					{
-					}
+					L2DatabaseFactory.close(con);
 				}
 			}
 		}

L2_GameServer/java/com/l2jserver/gameserver/datatables/LevelUpData.java

@@ -96,13 +96,7 @@ public class LevelUpData
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	

L2_GameServer/java/com/l2jserver/gameserver/datatables/MapRegionTable.java

@@ -102,13 +102,7 @@ public class MapRegionTable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	

L2_GameServer/java/com/l2jserver/gameserver/datatables/NpcBufferTable.java

@@ -171,13 +171,7 @@ public class NpcBufferTable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		
 		_log.info("NpcBufferSkillIdsTable: Loaded " + _buffers.size() + " buffers and " + skillCount + " skills.");

L2_GameServer/java/com/l2jserver/gameserver/datatables/NpcTable.java

@@ -19,7 +19,6 @@ import gnu.trove.TIntObjectHashMap;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -465,14 +464,7 @@ public class NpcTable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (SQLException e)
-			{
-				// nothing
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -635,13 +627,7 @@ public class NpcTable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -718,13 +704,7 @@ public class NpcTable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 

L2_GameServer/java/com/l2jserver/gameserver/datatables/NpcWalkerRoutesTable.java

@@ -87,13 +87,7 @@ public class NpcWalkerRoutesTable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	

L2_GameServer/java/com/l2jserver/gameserver/datatables/PetDataTable.java

@@ -102,13 +102,7 @@ public class PetDataTable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 

L2_GameServer/java/com/l2jserver/gameserver/datatables/PetNameTable.java

@@ -71,13 +71,7 @@ public class PetNameTable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		return result;
 	}

L2_GameServer/java/com/l2jserver/gameserver/datatables/PetSkillsTable.java

@@ -106,13 +106,7 @@ public class PetSkillsTable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	

L2_GameServer/java/com/l2jserver/gameserver/datatables/ResidentialSkillTable.java

@@ -72,14 +72,7 @@ public class ResidentialSkillTable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch(Exception e)
-			{
-
-			}
+			L2DatabaseFactory.close(con);
 			_log.info("ResidentialSkillTable: Loaded " + _list.size() + " entities with associated skills.");
 		}
 	}

L2_GameServer/java/com/l2jserver/gameserver/datatables/SkillSpellbookTable.java

@@ -66,13 +66,7 @@ public class SkillSpellbookTable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	

L2_GameServer/java/com/l2jserver/gameserver/datatables/SkillTreeTable.java

@@ -354,13 +354,7 @@ public class SkillTreeTable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		
 		_log.info("FishingSkillTreeTable: Loaded " + count2 + " general skills.");

L2_GameServer/java/com/l2jserver/gameserver/datatables/SpawnTable.java

@@ -148,13 +148,7 @@ public class SpawnTable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		
 		_log.info("SpawnTable: Loaded " + _spawntable.size() + " Npc Spawn Locations.");
@@ -244,13 +238,7 @@ public class SpawnTable
 			}
 			finally
 			{
-				try
-				{
-					con.close();
-				}
-				catch (Exception e)
-				{
-				}
+				L2DatabaseFactory.close(con);
 			}
 			_log.info("CustomSpawnTable: Loaded " + _customSpawnCount + " Npc Spawn Locations.");
 			
@@ -305,13 +293,7 @@ public class SpawnTable
 			}
 			finally
 			{
-				try
-				{
-					con.close();
-				}
-				catch (Exception e)
-				{
-				}
+				L2DatabaseFactory.close(con);
 			}
 		}
 	}
@@ -343,13 +325,7 @@ public class SpawnTable
 				}
 				finally
 				{
-					try
-					{
-						con.close();
-					}
-					catch (Exception e)
-					{
-					}
+					L2DatabaseFactory.close(con);
 				}
 			}
 			else
@@ -370,13 +346,7 @@ public class SpawnTable
 				}
 				finally
 				{
-					try
-					{
-						con.close();
-					}
-					catch (Exception e)
-					{
-					}
+					L2DatabaseFactory.close(con);
 				}
 			}
 		}

L2_GameServer/java/com/l2jserver/gameserver/datatables/TeleportLocationTable.java

@@ -84,13 +84,7 @@ public class TeleportLocationTable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+				L2DatabaseFactory.close(con);
 		}
 		
 		if (Config.CUSTOM_TELEPORT_TABLE)
@@ -125,13 +119,7 @@ public class TeleportLocationTable
 			}
 			finally
 			{
-				try
-				{
-					con.close();
-				}
-				catch (Exception e)
-				{
-				}
+				L2DatabaseFactory.close(con);
 			}
 		}
 	}

L2_GameServer/java/com/l2jserver/gameserver/idfactory/CompactionIDFactory.java

@@ -76,13 +76,7 @@ public class CompactionIDFactory extends IdFactory
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	

L2_GameServer/java/com/l2jserver/gameserver/idfactory/IdFactory.java

@@ -151,13 +151,7 @@ public abstract class IdFactory
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -268,13 +262,7 @@ public abstract class IdFactory
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 
@@ -301,13 +289,7 @@ public abstract class IdFactory
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 
@@ -381,14 +363,7 @@ public abstract class IdFactory
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-				
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	

L2_GameServer/java/com/l2jserver/gameserver/idfactory/StackIDFactory.java

@@ -75,13 +75,7 @@ public class StackIDFactory extends IdFactory
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	

L2_GameServer/java/com/l2jserver/gameserver/instancemanager/AuctionManager.java

@@ -119,13 +119,7 @@ public class AuctionManager
 		
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -184,13 +178,7 @@ public class AuctionManager
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	

L2_GameServer/java/com/l2jserver/gameserver/instancemanager/CastleManager.java

@@ -256,13 +256,7 @@ public class CastleManager implements InstanceListManager
 			}
 			finally
 			{
-				try
-				{
-					con.close();
-				}
-				catch (Exception e)
-				{
-				}
+				L2DatabaseFactory.close(con);
 			}
 		}
 	}
@@ -295,13 +289,7 @@ public class CastleManager implements InstanceListManager
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	

L2_GameServer/java/com/l2jserver/gameserver/instancemanager/CastleManorManager.java

@@ -276,13 +276,7 @@ public class CastleManorManager
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 

L2_GameServer/java/com/l2jserver/gameserver/instancemanager/ClanHallManager.java

@@ -131,13 +131,7 @@ public class ClanHallManager
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	

L2_GameServer/java/com/l2jserver/gameserver/instancemanager/CoupleManager.java

@@ -90,13 +90,7 @@ public class CoupleManager
 		
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	

L2_GameServer/java/com/l2jserver/gameserver/instancemanager/CursedWeaponsManager.java

@@ -229,13 +229,7 @@ public class CursedWeaponsManager
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -325,13 +319,7 @@ public class CursedWeaponsManager
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		
 		if (Config.DEBUG)
@@ -453,7 +441,6 @@ public class CursedWeaponsManager
 			statement.executeUpdate();
 			
 			statement.close();
-			con.close();
 		}
 		catch (SQLException e)
 		{
@@ -461,13 +448,7 @@ public class CursedWeaponsManager
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	

L2_GameServer/java/com/l2jserver/gameserver/instancemanager/DimensionalRiftManager.java

@@ -118,13 +118,7 @@ public class DimensionalRiftManager
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		
 		int typeSize = _rooms.keys().length;

L2_GameServer/java/com/l2jserver/gameserver/instancemanager/FortManager.java

@@ -191,13 +191,7 @@ public class FortManager implements InstanceListManager
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	

L2_GameServer/java/com/l2jserver/gameserver/instancemanager/FortSiegeGuardManager.java

@@ -145,13 +145,7 @@ public class FortSiegeGuardManager
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	

L2_GameServer/java/com/l2jserver/gameserver/instancemanager/FortSiegeManager.java

@@ -144,13 +144,7 @@ public class FortSiegeManager
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		return register;
 	}

L2_GameServer/java/com/l2jserver/gameserver/instancemanager/FourSepulchersManager.java

@@ -460,13 +460,7 @@ public class FourSepulchersManager
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -574,13 +568,7 @@ public class FourSepulchersManager
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -654,13 +642,7 @@ public class FourSepulchersManager
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -735,13 +717,7 @@ public class FourSepulchersManager
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -815,13 +791,7 @@ public class FourSepulchersManager
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	

L2_GameServer/java/com/l2jserver/gameserver/instancemanager/GrandBossManager.java

@@ -164,13 +164,7 @@ public class GrandBossManager
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -226,13 +220,7 @@ public class GrandBossManager
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		
 		for (L2BossZone zone : _zones)
@@ -417,13 +405,7 @@ public class GrandBossManager
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -472,13 +454,7 @@ public class GrandBossManager
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	

L2_GameServer/java/com/l2jserver/gameserver/instancemanager/InstanceManager.java

@@ -91,7 +91,7 @@ public class InstanceManager
 			_playerInstanceTimes.get(playerObjId).put(id, time);
 		}
 		catch (Exception e) { _log.log(Level.WARNING, "Could not insert character instance time data: "+ e.getMessage(), e); }
-		finally { try { con.close(); } catch (Exception e) {} }
+		finally { L2DatabaseFactory.close(con); }
 	}
 
 	public void deleteInstanceTime(int playerObjId, int id)
@@ -109,7 +109,7 @@ public class InstanceManager
 			_playerInstanceTimes.get(playerObjId).remove(id);
 		}
 		catch (Exception e) { _log.log(Level.WARNING, "Could not delete character instance time data: "+ e.getMessage(), e); }
-		finally { try { con.close(); } catch (Exception e) {} }
+		finally { L2DatabaseFactory.close(con); }
 	}
 
 	public void restoreInstanceTimes(int playerObjId)
@@ -144,7 +144,7 @@ public class InstanceManager
 		}
 		finally
 		{
-			try { con.close(); } catch (Exception e) {}
+			L2DatabaseFactory.close(con);
 		}
 	}
 

L2_GameServer/java/com/l2jserver/gameserver/instancemanager/ItemsOnGroundManager.java

@@ -94,13 +94,7 @@ public class ItemsOnGroundManager
 			}
 			finally
 			{
-				try
-				{
-					con.close();
-				}
-				catch (Exception e)
-				{
-				}
+				L2DatabaseFactory.close(con);
 			}
 		}
 		
@@ -155,13 +149,7 @@ public class ItemsOnGroundManager
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		if (Config.EMPTY_DROPPED_ITEM_TABLE_AFTER_LOAD)
 			emptyTable();
@@ -285,13 +273,7 @@ public class ItemsOnGroundManager
 			}
 			finally
 			{
-				try
-				{
-					con.close();
-				}
-				catch (Exception e)
-				{
-				}
+				L2DatabaseFactory.close(con);
 			}
 			
 			if (Config.DEBUG)

L2_GameServer/java/com/l2jserver/gameserver/instancemanager/MailManager.java

@@ -85,6 +85,8 @@ public class MailManager
 				else
 					ThreadPoolManager.getInstance().scheduleGeneral(new MessageDeletionTask(msgId), expiration - System.currentTimeMillis());
 			}
+			stmt1.close();
+			stmt2.close();
 		}
 		catch (SQLException e)
 		{
@@ -92,21 +94,7 @@ public class MailManager
 		}
 		finally
 		{
-			try
-			{
-				stmt1.close();
-			}
-			catch (Exception e) {}
-			try
-			{
-				stmt2.close();
-			}
-			catch (Exception e) {}
-			try
-			{
-				con.close();
-			}
-			catch (Exception e) {}
+			L2DatabaseFactory.close(con);
 		}
 		_log.info("Mail Manager: Successfully loaded " + readed + " messages.");
 	}
@@ -192,6 +180,7 @@ public class MailManager
 			con = L2DatabaseFactory.getInstance().getConnection();
 			stmt = Message.getStatement(msg, con);
 			stmt.execute();
+			stmt.close();
 		}
 		catch (SQLException e)
 		{
@@ -199,16 +188,7 @@ public class MailManager
 		}
 		finally
 		{
-			try
-			{
-				stmt.close();
-			}
-			catch (Exception e) {}
-			try
-			{
-				con.close();
-			}
-			catch (Exception e) {}
+			L2DatabaseFactory.close(con);
 		}
 
 		final L2PcInstance receiver = L2World.getInstance().getPlayer(msg.getReceiverId());
@@ -275,7 +255,8 @@ public class MailManager
 			con = L2DatabaseFactory.getInstance().getConnection();
 			stmt = con.prepareStatement("UPDATE messages SET isUnread = 'false' WHERE messageId = ?");
 			stmt.setInt(1, msgId);
-			stmt.execute();			
+			stmt.execute();
+			stmt.close();
 		}
 		catch (SQLException e)
 		{
@@ -283,16 +264,7 @@ public class MailManager
 		}
 		finally
 		{
-			try
-			{
-				stmt.close();
-			}
-			catch (Exception e) {}
-			try
-			{
-				con.close();
-			}
-			catch (Exception e) {}
+			L2DatabaseFactory.close(con);
 		}
 	}
 
@@ -309,6 +281,7 @@ public class MailManager
 			stmt.setInt(1, msgId);
 
 			stmt.execute();
+			stmt.close();
 		}
 		catch (SQLException e)
 		{
@@ -316,16 +289,7 @@ public class MailManager
 		}
 		finally
 		{
-			try
-			{
-				stmt.close();
-			}
-			catch (Exception e) {}
-			try
-			{
-				con.close();
-			}
-			catch (Exception e) {}
+			L2DatabaseFactory.close(con);
 		}
 	}
 
@@ -342,6 +306,7 @@ public class MailManager
 			stmt.setInt(1, msgId);
 
 			stmt.execute();
+			stmt.close();
 		}
 		catch (SQLException e)
 		{
@@ -349,16 +314,7 @@ public class MailManager
 		}
 		finally
 		{
-			try
-			{
-				stmt.close();
-			}
-			catch (Exception e) {}
-			try
-			{
-				con.close();
-			}
-			catch (Exception e) {}
+			L2DatabaseFactory.close(con);
 		}
 	}
 
@@ -375,6 +331,7 @@ public class MailManager
 			stmt.setInt(1, msgId);
 
 			stmt.execute();
+			stmt.close();
 		}
 		catch (SQLException e)
 		{
@@ -382,16 +339,7 @@ public class MailManager
 		}
 		finally
 		{
-			try
-			{
-				stmt.close();
-			}
-			catch (Exception e) {}
-			try
-			{
-				con.close();
-			}
-			catch (Exception e) {}
+			L2DatabaseFactory.close(con);
 		}
 	}
 
@@ -408,6 +356,7 @@ public class MailManager
 			stmt.setInt(1, msgId);
 
 			stmt.execute();
+			stmt.close();
 		}
 		catch (SQLException e)
 		{
@@ -415,16 +364,7 @@ public class MailManager
 		}
 		finally
 		{
-			try
-			{
-				stmt.close();
-			}
-			catch (Exception e) {}
-			try
-			{
-				con.close();
-			}
-			catch (Exception e) {}
+			L2DatabaseFactory.close(con);
 		}
 
 		_messages.remove(msgId);

L2_GameServer/java/com/l2jserver/gameserver/instancemanager/MercTicketManager.java

@@ -211,13 +211,7 @@ public class MercTicketManager
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	

L2_GameServer/java/com/l2jserver/gameserver/instancemanager/RaidBossPointsManager.java

@@ -93,13 +93,7 @@ public class RaidBossPointsManager
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch(Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 
@@ -116,10 +110,14 @@ public class RaidBossPointsManager
             statement.setInt(3, points);
 			statement.executeUpdate();
             statement.close();
-        } catch (Exception e) {
+        }
+        catch (Exception e)
+        {
 			_log.log(Level.WARNING, "could not update char raid points:", e);
-        } finally {
-            try { con.close(); } catch (Exception e) {}
+        }
+        finally
+        {
+            L2DatabaseFactory.close(con);
         }
 	}
 
@@ -182,10 +180,14 @@ public class RaidBossPointsManager
             statement.close();
             _list.clear();
             _list = new FastMap<Integer, Map<Integer, Integer>>();
-        } catch (Exception e) {
+        }
+        catch (Exception e)
+        {
 			_log.log(Level.WARNING, "could not clean raid points: ", e);
-        } finally {
-            try { con.close(); } catch (Exception e) {}
+        }
+        finally
+        {
+            L2DatabaseFactory.close(con);
         }
 	}
 

L2_GameServer/java/com/l2jserver/gameserver/instancemanager/RaidBossSpawnManager.java

@@ -126,13 +126,7 @@ public class RaidBossSpawnManager
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 
@@ -298,13 +292,7 @@ public class RaidBossSpawnManager
 			}
 			finally
 			{
-				try
-				{
-					con.close();
-				}
-				catch (Exception e)
-				{
-				}
+				L2DatabaseFactory.close(con);
 			}
 		}
 	}
@@ -354,13 +342,7 @@ public class RaidBossSpawnManager
 			}
 			finally
 			{
-				try
-				{
-					con.close();
-				}
-				catch (Exception e)
-				{
-				}
+				L2DatabaseFactory.close(con);
 			}
 		}
 	}
@@ -414,13 +396,7 @@ public class RaidBossSpawnManager
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 

L2_GameServer/java/com/l2jserver/gameserver/instancemanager/SiegeGuardManager.java

@@ -109,13 +109,7 @@ public class SiegeGuardManager
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -139,13 +133,7 @@ public class SiegeGuardManager
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -248,13 +236,7 @@ public class SiegeGuardManager
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -288,13 +270,7 @@ public class SiegeGuardManager
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	

L2_GameServer/java/com/l2jserver/gameserver/instancemanager/SiegeManager.java

@@ -149,13 +149,7 @@ public class SiegeManager
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		return register;
 	}

L2_GameServer/java/com/l2jserver/gameserver/instancemanager/TerritoryWarManager.java

@@ -622,13 +622,7 @@ public class TerritoryWarManager
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -654,13 +648,7 @@ public class TerritoryWarManager
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 
@@ -723,13 +711,7 @@ public class TerritoryWarManager
 			}
 			finally
 			{
-				try
-				{
-					con.close();
-				}
-				catch (Exception e)
-				{
-				}
+				L2DatabaseFactory.close(con);
 			}
 			try
 			{
@@ -770,13 +752,7 @@ public class TerritoryWarManager
 			}
 			finally
 			{
-				try
-				{
-					con.close();
-				}
-				catch (Exception e)
-				{
-				}
+				L2DatabaseFactory.close(con);
 			}
 			try
 			{
@@ -810,13 +786,7 @@ public class TerritoryWarManager
 			}
 			finally
 			{
-				try
-				{
-					con.close();
-				}
-				catch (Exception e)
-				{
-				}
+				L2DatabaseFactory.close(con);
 			}
 		}
 		catch (Exception e)

L2_GameServer/java/com/l2jserver/gameserver/instancemanager/ZoneManager.java

@@ -375,13 +375,7 @@ public class ZoneManager
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		
 		_log.info("Done: loaded " + _zones.size() + " zones.");

L2_GameServer/java/com/l2jserver/gameserver/instancemanager/games/Lottery.java

@@ -105,13 +105,7 @@ public class Lottery
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -189,13 +183,7 @@ public class Lottery
 			}
 			finally
 			{
-				try
-				{
-					con.close();
-				}
-				catch (Exception e)
-				{
-				}
+				L2DatabaseFactory.close(con);
 			}
 			
 			if (Config.DEBUG)
@@ -243,13 +231,7 @@ public class Lottery
 			}
 			finally
 			{
-				try
-				{
-					con.close();
-				}
-				catch (Exception e)
-				{
-				}
+				L2DatabaseFactory.close(con);
 			}
 		}
 	}
@@ -378,13 +360,7 @@ public class Lottery
 			}
 			finally
 			{
-				try
-				{
-					con.close();
-				}
-				catch (Exception e)
-				{
-				}
+				L2DatabaseFactory.close(con);
 			}
 			
 			long prize4 = count4 * Config.ALT_LOTTERY_2_AND_1_NUMBER_PRIZE;
@@ -453,13 +429,7 @@ public class Lottery
 			}
 			finally
 			{
-				try
-				{
-					con.close();
-				}
-				catch (Exception e)
-				{
-				}
+				L2DatabaseFactory.close(con);
 			}
 			
 			ThreadPoolManager.getInstance().scheduleGeneral(new startLottery(), MINUTE);
@@ -581,13 +551,7 @@ public class Lottery
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		
 		return res;

L2_GameServer/java/com/l2jserver/gameserver/model/AutoChatHandler.java

@@ -111,13 +111,7 @@ public class AutoChatHandler implements SpawnListener
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	

L2_GameServer/java/com/l2jserver/gameserver/model/AutoSpawnHandler.java

@@ -174,13 +174,7 @@ public class AutoSpawnHandler
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	

L2_GameServer/java/com/l2jserver/gameserver/model/BlockList.java

@@ -110,7 +110,7 @@ public class BlockList
 		}
 		finally
 		{
-			try	{ con.close(); } catch (Exception e) {}
+			L2DatabaseFactory.close(con);
 		}
 		return list;
 	}
@@ -143,12 +143,7 @@ public class BlockList
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{}
+			L2DatabaseFactory.close(con);
 		}
 	}
 

L2_GameServer/java/com/l2jserver/gameserver/model/CursedWeapon.java

@@ -171,7 +171,7 @@ public class CursedWeapon
 	    		}
 	    		finally
 	    		{
-	    			try { con.close(); } catch (Exception e) {}
+	    			L2DatabaseFactory.close(con);
 	    		}
 	    	}
 		} else
@@ -509,11 +509,7 @@ public class CursedWeapon
         }
         finally
         {
-        	try
-        	{
-        	    con.close();
-        	}
-        	catch (Exception e) {}
+            L2DatabaseFactory.close(con);
         }
     }
 

L2_GameServer/java/com/l2jserver/gameserver/model/L2Clan.java

@@ -766,13 +766,7 @@ public class L2Clan
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -803,13 +797,7 @@ public class L2Clan
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -842,13 +830,7 @@ public class L2Clan
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -884,13 +866,7 @@ public class L2Clan
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -916,13 +892,7 @@ public class L2Clan
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -1009,13 +979,7 @@ public class L2Clan
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -1044,13 +1008,7 @@ public class L2Clan
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		
 	}
@@ -1088,13 +1046,7 @@ public class L2Clan
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		
 		_notice = notice;
@@ -1156,13 +1108,7 @@ public class L2Clan
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -1232,13 +1178,7 @@ public class L2Clan
 			}
 			finally
 			{
-				try
-				{
-					con.close();
-				}
-				catch (Exception e)
-				{
-				}
+				L2DatabaseFactory.close(con);
 			}
 			
 			for (L2ClanMember temp : _members.values())
@@ -1626,13 +1566,7 @@ public class L2Clan
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -1736,13 +1670,7 @@ public class L2Clan
 			}
 			finally
 			{
-				try
-				{
-					con.close();
-				}
-				catch (Exception e)
-				{
-				}
+				L2DatabaseFactory.close(con);
 			}
 		}
 		broadcastToOnlineMembers(new PledgeShowInfoUpdate(_leader.getClan()));
@@ -1801,13 +1729,7 @@ public class L2Clan
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -1846,13 +1768,7 @@ public class L2Clan
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -1904,13 +1820,7 @@ public class L2Clan
 			}
 			finally
 			{
-				try
-				{
-					con.close();
-				}
-				catch (Exception e)
-				{
-				}
+				L2DatabaseFactory.close(con);
 			}
 			for (L2ClanMember cm : getMembers())
 			{
@@ -1950,13 +1860,7 @@ public class L2Clan
 			}
 			finally
 			{
-				try
-				{
-					con.close();
-				}
-				catch (Exception e)
-				{
-				}
+				L2DatabaseFactory.close(con);
 			}
 		}
 	}
@@ -2077,13 +1981,7 @@ public class L2Clan
 			}
 			finally
 			{
-				try
-				{
-					con.close();
-				}
-				catch (Exception e)
-				{
-				}
+				L2DatabaseFactory.close(con);
 			}
 		}
 	}
@@ -2680,13 +2578,7 @@ public class L2Clan
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		
 		setLevel(level);
@@ -2753,13 +2645,7 @@ public class L2Clan
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		
 		for (L2PcInstance member : getOnlineMembers(0))
@@ -2798,13 +2684,7 @@ public class L2Clan
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		
 		if (onlyThisClan)
@@ -2859,13 +2739,7 @@ public class L2Clan
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		
 		for (L2PcInstance member : getOnlineMembers(0))

L2_GameServer/java/com/l2jserver/gameserver/model/L2ClanMember.java

@@ -254,7 +254,7 @@ public class L2ClanMember
 		}
 		finally
 		{
-			try { con.close(); } catch (Exception e) {}
+			L2DatabaseFactory.close(con);
 		}
 	}
 
@@ -304,7 +304,7 @@ public class L2ClanMember
 		}
 		finally
 		{
-			try { con.close(); } catch (Exception e) {}
+			L2DatabaseFactory.close(con);
 		}
 	}
 
@@ -644,7 +644,7 @@ public class L2ClanMember
          }
          finally
          {
-             try { con.close(); } catch (Exception e) {}
+             L2DatabaseFactory.close(con);
          }
     }
 }

L2_GameServer/java/com/l2jserver/gameserver/model/L2ItemInstance.java

@@ -894,7 +894,7 @@ public final class L2ItemInstance extends L2Object
 		}
 		finally
 		{
-			try { con.close(); } catch (Exception e) {}
+			L2DatabaseFactory.close(con);
 		}
 	}
 
@@ -928,13 +928,7 @@ public final class L2ItemInstance extends L2Object
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 
@@ -985,7 +979,7 @@ public final class L2ItemInstance extends L2Object
 		}
 		finally
 		{
-			try { con.close(); } catch (Exception e) {}
+			L2DatabaseFactory.close(con);
 		}
 	}
 
@@ -1075,7 +1069,7 @@ public final class L2ItemInstance extends L2Object
 		}
 		finally
 		{
-			try { con.close(); } catch (Exception e) {}
+			L2DatabaseFactory.close(con);
 		}
 	}
 
@@ -1527,6 +1521,7 @@ public final class L2ItemInstance extends L2Object
 			statement.executeUpdate();
 			_existsInDb = true;
 			_storedInDb = true;
+			statement.close();
         }
         catch (Exception e)
         {
@@ -1534,19 +1529,7 @@ public final class L2ItemInstance extends L2Object
 		}
         finally
         {
-			try
-			{
-				statement.close();
-			} catch (Exception e)
-			{
-			}
-
-			try
-			{
-				con.close();
-			} catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 
@@ -1583,6 +1566,7 @@ public final class L2ItemInstance extends L2Object
 			statement.executeUpdate();
 			_existsInDb = true;
 			_storedInDb = true;
+			statement.close();
         }
         catch (Exception e)
         {
@@ -1590,19 +1574,7 @@ public final class L2ItemInstance extends L2Object
 		}
         finally
         {
-			try
-			{
-				statement.close();
-			} catch (Exception e)
-			{
-			}
-
-			try
-			{
-				con.close();
-			} catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 
         if (_elementals != null)
@@ -1634,6 +1606,7 @@ public final class L2ItemInstance extends L2Object
 			statement = con.prepareStatement("DELETE FROM item_attributes WHERE itemId = ?");
 			statement.setInt(1, getObjectId());
 			statement.executeUpdate();
+			statement.close();
 		}
 		catch (Exception e)
 		{
@@ -1641,19 +1614,7 @@ public final class L2ItemInstance extends L2Object
 		}
 		finally
 		{
-			try
-			{
-				statement.close();
-			} catch (Exception e)
-			{
-			}
-
-			try
-			{
-				con.close();
-			} catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 

L2_GameServer/java/com/l2jserver/gameserver/model/L2TradeList.java

@@ -368,14 +368,7 @@ public class L2TradeList
 			}
 			finally
 			{
-				try
-				{
-					con.close();
-				}
-				catch (Exception e)
-				{
-					// nothing
-				}
+				L2DatabaseFactory.close(con);
 			}
 		}
 	}

L2_GameServer/java/com/l2jserver/gameserver/model/L2UIKeysSettings.java

@@ -17,7 +17,6 @@ package com.l2jserver.gameserver.model;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Level;
@@ -151,13 +150,7 @@ public class L2UIKeysSettings
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		_saved = true;
 	}
@@ -193,13 +186,7 @@ public class L2UIKeysSettings
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (SQLException e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		
 		if (_storedCategories.size() < 1)
@@ -240,13 +227,7 @@ public class L2UIKeysSettings
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (SQLException e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		
 		if (_storedKeys.size() < 1)

L2_GameServer/java/com/l2jserver/gameserver/model/MacroList.java

@@ -159,7 +159,7 @@ public class MacroList
         }
         finally
         {
-            try { con.close(); } catch (Exception e) {}
+            L2DatabaseFactory.close(con);
         }
     }
 
@@ -185,7 +185,7 @@ public class MacroList
         }
         finally
         {
-            try { con.close(); } catch (Exception e) {}
+            L2DatabaseFactory.close(con);
         }
     }
 
@@ -234,7 +234,7 @@ public class MacroList
         }
         finally
         {
-            try { con.close(); } catch (Exception e) {}
+            L2DatabaseFactory.close(con);
         }
     }
 }

L2_GameServer/java/com/l2jserver/gameserver/model/ShortCuts.java

@@ -111,7 +111,7 @@ public class ShortCuts
         }
         finally
         {
-            try { con.close(); } catch (Exception e) {}
+            L2DatabaseFactory.close(con);
         }
     }
 
@@ -184,7 +184,7 @@ public class ShortCuts
         }
         finally
         {
-            try { con.close(); } catch (Exception e) {}
+            L2DatabaseFactory.close(con);
         }
     }
 
@@ -223,7 +223,7 @@ public class ShortCuts
         }
         finally
         {
-            try { con.close(); } catch (Exception e) {}
+            L2DatabaseFactory.close(con);
         }
 
 		// verify shortcuts

L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java

@@ -1540,12 +1540,8 @@ public final class L2PcInstance extends L2Playable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e){}
-		}		
+			L2DatabaseFactory.close(con);
+		}
 	}
 	
 	private void deleteRecipeData(int recipeId, boolean isDwarf)
@@ -1569,10 +1565,7 @@ public final class L2PcInstance extends L2Playable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			} catch (Exception e) {}
+			L2DatabaseFactory.close(con);
 		}
 	}
 
@@ -2205,7 +2198,7 @@ public final class L2PcInstance extends L2Playable
 			}
 			finally
 			{
-				try { con.close(); } catch (Exception e) {}
+				L2DatabaseFactory.close(con);
 			}
 		}
 		target.incRecomHave();
@@ -5077,7 +5070,7 @@ public final class L2PcInstance extends L2Playable
         }
         finally
         {
-            try { con.close(); } catch (Exception e) {}
+            L2DatabaseFactory.close(con);
         }
     }
     
@@ -5107,7 +5100,7 @@ public final class L2PcInstance extends L2Playable
         }
         finally
         {
-            try { con.close(); } catch (Exception e) {}
+            L2DatabaseFactory.close(con);
         }
         return _transformationId;
     }
@@ -7113,7 +7106,7 @@ public final class L2PcInstance extends L2Playable
 		}
 		finally
 		{
-			try { con.close(); } catch (Exception e) {}
+			L2DatabaseFactory.close(con);
 		}
 	}
 
@@ -7177,7 +7170,7 @@ public final class L2PcInstance extends L2Playable
 		}
 		finally
 		{
-			try { con.close(); } catch (Exception e) {}
+			L2DatabaseFactory.close(con);
 		}
 		return true;
 	}
@@ -7419,7 +7412,7 @@ public final class L2PcInstance extends L2Playable
 		}
 		finally
 		{
-			try { con.close(); } catch (Exception e) {}
+			L2DatabaseFactory.close(con);
 		}
 
 		return player;
@@ -7510,11 +7503,13 @@ public final class L2PcInstance extends L2Playable
 
             statement.close();
         }
-        catch (Exception e) {
+        catch (Exception e)
+        {
             _log.log(Level.WARNING, "Could not restore classes for " + player.getName() + ": " + e.getMessage(), e);
         }
-        finally {
-            try { con.close(); } catch (Exception e) {}
+        finally
+        {
+            L2DatabaseFactory.close(con);
         }
 
         return true;
@@ -7595,8 +7590,9 @@ public final class L2PcInstance extends L2Playable
 		{
 			_log.log(Level.SEVERE, "Could not restore recipe book data:" + e.getMessage(), e);
 		}
-		finally {
-			try { con.close(); } catch (Exception e) {}
+		finally
+		{
+			L2DatabaseFactory.close(con);
 		}
 	}
 
@@ -7715,13 +7711,7 @@ public final class L2PcInstance extends L2Playable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 
@@ -7756,13 +7746,7 @@ public final class L2PcInstance extends L2Playable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
     
@@ -7878,13 +7862,7 @@ public final class L2PcInstance extends L2Playable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 
@@ -7993,7 +7971,7 @@ public final class L2PcInstance extends L2Playable
 		}
 		finally
 		{
-			try { con.close(); } catch (Exception e) {}
+			L2DatabaseFactory.close(con);
 		}
 
 		if (this.transformId() > 0 || this.isCursedWeaponEquipped())
@@ -8060,7 +8038,7 @@ public final class L2PcInstance extends L2Playable
 		}
 		finally
 		{
-			try { con.close(); } catch (Exception e) {}
+			L2DatabaseFactory.close(con);
 		}
 	}
 
@@ -8106,7 +8084,7 @@ public final class L2PcInstance extends L2Playable
 		}
 		finally
 		{
-			try { con.close(); } catch (Exception e) {}
+			L2DatabaseFactory.close(con);
 		}
 	}
 
@@ -8179,11 +8157,13 @@ public final class L2PcInstance extends L2Playable
 			statement.executeUpdate();
 			statement.close();
 		}
-		catch (Exception e) {
+		catch (Exception e)
+		{
 			_log.log(Level.WARNING, "Could not restore "+this+" active effect data: " + e.getMessage(), e);
 		}
-		finally {
-			try {con.close();} catch (Exception e) {}
+		finally
+		{
+			L2DatabaseFactory.close(con);
 		}
 	}
 
@@ -8237,7 +8217,7 @@ public final class L2PcInstance extends L2Playable
 		}
 		finally
 		{
-			try { con.close(); } catch (Exception e) {}
+			L2DatabaseFactory.close(con);
 		}
 
 		// Calculate Henna modifiers of this L2PcInstance
@@ -8271,7 +8251,7 @@ public final class L2PcInstance extends L2Playable
 		}
 		finally
 		{
-			try { con.close(); } catch (Exception e) {}
+			L2DatabaseFactory.close(con);
 		}
 	}
 
@@ -8334,7 +8314,7 @@ public final class L2PcInstance extends L2Playable
 		}
 		finally
 		{
-			try { con.close(); } catch (Exception e) {}
+			L2DatabaseFactory.close(con);
 		}
 
 		// Calculate Henna modifiers of this L2PcInstance
@@ -8396,7 +8376,7 @@ public final class L2PcInstance extends L2Playable
 				}
 				finally
 				{
-					try { con.close(); } catch (Exception e) {}
+					L2DatabaseFactory.close(con);
 				}
 
 				// Send Server->Client HennaInfo packet to this L2PcInstance
@@ -10459,6 +10439,7 @@ public final class L2PcInstance extends L2Playable
                 statement.setInt(6, newClass.getClassIndex()); // <-- Added
                 
                 statement.execute();
+                statement.close();
             }
             catch (Exception e) {
                 _log.log(Level.WARNING, "WARNING: Could not add character sub class for " + getName() + ": " + e.getMessage(), e);
@@ -10466,20 +10447,7 @@ public final class L2PcInstance extends L2Playable
             }
             finally
             {
-            	try
-            	{
-            		statement.close();
-            	}
-            	catch (Exception e)
-            	{
-            	}
-                try
-                {
-                	con.close();
-                }
-                catch (Exception e)
-                {
-                }
+               	L2DatabaseFactory.close(con);
             }
 
             // Commit after database INSERT incase exception is thrown.
@@ -10595,20 +10563,7 @@ public final class L2PcInstance extends L2Playable
             }
             finally
             {
-            	try
-            	{
-            		statement.close();
-            	}
-            	catch (Exception e)
-            	{
-            	}
-                try
-                {
-                	con.close();
-                }
-                catch (Exception e)
-                {
-                }
+              	L2DatabaseFactory.close(con);
             }
 
             getSubClasses().remove(classIndex);
@@ -10997,7 +10952,7 @@ public final class L2PcInstance extends L2Playable
 			}
 			finally
 			{
-				try { con.close(); } catch (Exception e) {}
+				L2DatabaseFactory.close(con);
 			}
 		}
 
@@ -13813,13 +13768,7 @@ public final class L2PcInstance extends L2Playable
     		}
     		finally
     		{
-    			try
-    			{
-    				con.close();
-    			}
-    			catch (Exception e)
-    			{
-    			}
+   				L2DatabaseFactory.close(con);
     		}
     	}
     }
@@ -14033,13 +13982,7 @@ public final class L2PcInstance extends L2Playable
 				}
 				finally
 				{
-					try
-					{
-						con.close();
-					}
-					catch (Exception e)
-					{
-					}
+					L2DatabaseFactory.close(con);
 				}
     			
     		}
@@ -14071,13 +14014,7 @@ public final class L2PcInstance extends L2Playable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		
 		int count = 0;
@@ -14274,13 +14211,7 @@ public final class L2PcInstance extends L2Playable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		
 		sendPacket(new ExGetBookMarkInfoPacket(this));
@@ -14313,7 +14244,7 @@ public final class L2PcInstance extends L2Playable
 		}
 		finally
 		{
-			try { con.close(); } catch (Exception e) {}
+			L2DatabaseFactory.close(con);
 		}
     }
     
@@ -14533,7 +14464,7 @@ public final class L2PcInstance extends L2Playable
 		}
 		finally
 		{
-			try	{ con.close(); } catch (Exception e) {}
+			L2DatabaseFactory.close(con);
 		}
 	}
 
@@ -14606,13 +14537,7 @@ public final class L2PcInstance extends L2Playable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (SQLException e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -14643,13 +14568,7 @@ public final class L2PcInstance extends L2Playable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (SQLException e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 

L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2PetInstance.java

@@ -754,7 +754,7 @@ public class L2PetInstance extends L2Summon
 		}
 		finally
 		{
-			try { con.close(); } catch (Exception e) {}
+			L2DatabaseFactory.close(con);
 		}
 	}
 
@@ -857,11 +857,15 @@ public class L2PetInstance extends L2Summon
             rset.close();
 			statement.close();
 			return pet;
-		} catch (Exception e) {
+		}
+		catch (Exception e)
+		{
 			_logPet.log(Level.WARNING, "Could not restore pet data: "+ e.getMessage(), e);
 			return null;
-		} finally {
-			try { con.close(); } catch (Exception e) {}
+		}
+		finally
+		{
+			L2DatabaseFactory.close(con);
 		}
 	}
 
@@ -907,13 +911,7 @@ public class L2PetInstance extends L2Summon
         }
         finally
         {
-            try
-            {
-                con.close();
-            }
-            catch (Exception e)
-            {
-            }
+            L2DatabaseFactory.close(con);
         }
 
 		L2ItemInstance itemInst = getControlItem();

L2_GameServer/java/com/l2jserver/gameserver/model/entity/Auction.java

@@ -196,13 +196,7 @@ public class Auction
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -244,13 +238,7 @@ public class Auction
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -294,13 +282,7 @@ public class Auction
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -402,13 +384,7 @@ public class Auction
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -433,13 +409,7 @@ public class Auction
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		for (Bidder b : _bidders.values())
 		{
@@ -475,13 +445,7 @@ public class Auction
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -544,13 +508,7 @@ public class Auction
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		returnItem(_bidders.get(bidder).getClanName(), _bidders.get(bidder).getBid(), true);
 		ClanTable.getInstance().getClanByName(_bidders.get(bidder).getClanName()).setAuctionBiddedAt(0, true);
@@ -598,13 +556,7 @@ public class Auction
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	

L2_GameServer/java/com/l2jserver/gameserver/model/entity/Castle.java

@@ -244,13 +244,7 @@ public class Castle
 			}
 			finally
 			{
-				try
-				{
-					con.close();
-				}
-				catch (Exception e)
-				{
-				}
+				L2DatabaseFactory.close(con);
 			}
 		}
 	}
@@ -373,13 +367,7 @@ public class Castle
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		return true;
 	}
@@ -612,13 +600,7 @@ public class Castle
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -727,13 +709,7 @@ public class Castle
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -762,13 +738,7 @@ public class Castle
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -793,13 +763,7 @@ public class Castle
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -881,13 +845,7 @@ public class Castle
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -915,13 +873,7 @@ public class Castle
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -942,13 +894,7 @@ public class Castle
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -972,13 +918,7 @@ public class Castle
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -1028,13 +968,7 @@ public class Castle
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -1283,13 +1217,7 @@ public class Castle
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -1340,13 +1268,7 @@ public class Castle
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -1414,13 +1336,7 @@ public class Castle
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -1472,13 +1388,7 @@ public class Castle
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -1504,13 +1414,7 @@ public class Castle
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -1536,13 +1440,7 @@ public class Castle
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -1601,13 +1499,7 @@ public class Castle
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	

L2_GameServer/java/com/l2jserver/gameserver/model/entity/ClanHall.java

@@ -207,13 +207,7 @@ public class ClanHall
 			}
 			finally
 			{
-				try
-				{
-					con.close();
-				}
-				catch (Exception e)
-				{
-				}
+				L2DatabaseFactory.close(con);
 			}
 		}
 	}
@@ -469,13 +463,7 @@ public class ClanHall
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -500,13 +488,7 @@ public class ClanHall
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -571,13 +553,7 @@ public class ClanHall
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	

L2_GameServer/java/com/l2jserver/gameserver/model/entity/Couple.java

@@ -81,13 +81,7 @@ public class Couple
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -127,13 +121,7 @@ public class Couple
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -160,13 +148,7 @@ public class Couple
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -189,13 +171,7 @@ public class Couple
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	

L2_GameServer/java/com/l2jserver/gameserver/model/entity/Fort.java

@@ -233,13 +233,7 @@ public class Fort
 			}
 			finally
 			{
-				try
-				{
-					con.close();
-				}
-				catch (Exception e)
-				{
-				}
+				L2DatabaseFactory.close(con);
 			}
 		}
 	}
@@ -497,13 +491,7 @@ public class Fort
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -611,13 +599,7 @@ public class Fort
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -645,13 +627,7 @@ public class Fort
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -676,13 +652,7 @@ public class Fort
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -766,13 +736,7 @@ public class Fort
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -804,13 +768,7 @@ public class Fort
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -839,13 +797,7 @@ public class Fort
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -867,13 +819,7 @@ public class Fort
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -897,13 +843,7 @@ public class Fort
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -967,13 +907,7 @@ public class Fort
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -1125,13 +1059,7 @@ public class Fort
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -1275,13 +1203,7 @@ public class Fort
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -1328,13 +1250,7 @@ public class Fort
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -1382,13 +1298,7 @@ public class Fort
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -1440,13 +1350,7 @@ public class Fort
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	

L2_GameServer/java/com/l2jserver/gameserver/model/entity/FortSiege.java

@@ -538,13 +538,7 @@ public class FortSiege implements Siegable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -750,13 +744,7 @@ public class FortSiege implements Siegable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -996,13 +984,7 @@ public class FortSiege implements Siegable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -1061,13 +1043,7 @@ public class FortSiege implements Siegable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -1099,13 +1075,7 @@ public class FortSiege implements Siegable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	

L2_GameServer/java/com/l2jserver/gameserver/model/entity/Hero.java

@@ -245,14 +245,8 @@ public class Hero
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-				con2.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
+			L2DatabaseFactory.close(con2);
 		}
 		
 		_log.info("Hero System: Loaded " + _heroes.size() + " Heroes.");
@@ -333,13 +327,7 @@ public class Hero
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -477,14 +465,8 @@ public class Hero
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
-		}		
+			L2DatabaseFactory.close(con);
+		}
 	}
 	
 	public Map<Integer, StatsSet> getHeroes()
@@ -852,13 +834,7 @@ public class Hero
 				}
 				finally
 				{
-					try
-					{
-						con.close();
-					}
-					catch (Exception e)
-					{
-					}
+					L2DatabaseFactory.close(con);
 				}
 			}
 		}
@@ -961,14 +937,7 @@ public class Hero
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-				e.printStackTrace();
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -1048,13 +1017,7 @@ public class Hero
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -1075,14 +1038,7 @@ public class Hero
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (SQLException e)
-			{
-				e.printStackTrace();
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	

L2_GameServer/java/com/l2jserver/gameserver/model/entity/Siege.java

@@ -697,13 +697,7 @@ public class Siege implements Siegable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 
@@ -727,13 +721,7 @@ public class Siege implements Siegable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 
@@ -922,13 +910,7 @@ public class Siege implements Siegable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 
@@ -1167,13 +1149,7 @@ public class Siege implements Siegable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 
@@ -1291,13 +1267,7 @@ public class Siege implements Siegable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 
@@ -1363,13 +1333,7 @@ public class Siege implements Siegable
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 

L2_GameServer/java/com/l2jserver/gameserver/model/itemcontainer/Inventory.java

@@ -1648,11 +1648,7 @@ public abstract class Inventory extends ItemContainer
 		}
 		finally 
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e) {}
+			L2DatabaseFactory.close(con);
 		}
 	}
 

L2_GameServer/java/com/l2jserver/gameserver/model/itemcontainer/ItemContainer.java

@@ -652,13 +652,7 @@ public abstract class ItemContainer
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	

L2_GameServer/java/com/l2jserver/gameserver/model/itemcontainer/Mail.java

@@ -142,6 +142,7 @@ public class Mail extends ItemContainer
 				else
 					addItem(item);
 			}
+			statement.close();
 		}
 		catch (Exception e)
 		{
@@ -149,16 +150,7 @@ public class Mail extends ItemContainer
 		}
 		finally
 		{
-			try
-			{
-				statement.close();
-			}
-			catch (Exception e) {}
-			try
-			{
-				con.close();
-			}
-			catch (Exception e) {}
+			L2DatabaseFactory.close(con);
 		}
 	}
 

L2_GameServer/java/com/l2jserver/gameserver/model/itemcontainer/PcInventory.java

@@ -666,11 +666,13 @@ public class PcInventory extends Inventory
             invdata.close();
             statement2.close();
         }
-        catch (Exception e) {
+        catch (Exception e)
+        {
 			_log.log(Level.WARNING, "Could not restore inventory: " + e.getMessage(), e);
         }
-        finally {
-            try { con.close(); } catch (Exception e) {}
+        finally
+        {
+            L2DatabaseFactory.close(con);
         }
         return paperdoll;
     }

L2_GameServer/java/com/l2jserver/gameserver/model/olympiad/Olympiad.java

@@ -206,14 +206,7 @@ public class Olympiad
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-				e.printStackTrace();
-			}
+			L2DatabaseFactory.close(con);
 		}
 
 		if (!loaded)
@@ -309,14 +302,7 @@ public class Olympiad
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-				e.printStackTrace();
-			}
+			L2DatabaseFactory.close(con);
 		}
 		
 		synchronized (this)
@@ -374,13 +360,7 @@ public class Olympiad
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		int rank1 = (int) Math.round(tmpPlace.size() * 0.01);
 		int rank2 = (int) Math.round(tmpPlace.size() * 0.10);
@@ -1137,14 +1117,7 @@ public class Olympiad
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-				e.printStackTrace();
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -1181,14 +1154,7 @@ public class Olympiad
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-				e.printStackTrace();
-			}
+			L2DatabaseFactory.close(con);
 		}
 /*		Properties OlympiadProperties = new Properties();
 		FileOutputStream fos = null;
@@ -1241,13 +1207,7 @@ public class Olympiad
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -1392,14 +1352,7 @@ public class Olympiad
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-				e.printStackTrace();
-			}
+			L2DatabaseFactory.close(con);
 		}
 		
 	}
@@ -1450,14 +1403,7 @@ public class Olympiad
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-				e.printStackTrace();
-			}
+			L2DatabaseFactory.close(con);
 		}
 		
 		return names;
@@ -1562,11 +1508,7 @@ public class Olympiad
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e){}
+			L2DatabaseFactory.close(con);
 		}
 		
 		return result;
@@ -1628,14 +1570,7 @@ public class Olympiad
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-				e.printStackTrace();
-			}
+			L2DatabaseFactory.close(con);
 		}
 		
 		_nobles.clear();

L2_GameServer/java/com/l2jserver/gameserver/model/olympiad/OlympiadGame.java

@@ -1006,11 +1006,7 @@ class OlympiadGame
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e){}
+			L2DatabaseFactory.close(con);
 		}
 	}
 }

L2_GameServer/java/com/l2jserver/gameserver/model/quest/Quest.java

@@ -891,13 +891,7 @@ public class Quest extends ManagedScript
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		
 		// events
@@ -935,13 +929,7 @@ public class Quest extends ManagedScript
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -977,13 +965,7 @@ public class Quest extends ManagedScript
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		return result;
 	}
@@ -1011,13 +993,7 @@ public class Quest extends ManagedScript
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -1042,13 +1018,7 @@ public class Quest extends ManagedScript
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -1080,13 +1050,7 @@ public class Quest extends ManagedScript
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -1125,13 +1089,7 @@ public class Quest extends ManagedScript
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -1160,13 +1118,7 @@ public class Quest extends ManagedScript
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -1193,13 +1145,7 @@ public class Quest extends ManagedScript
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	

L2_GameServer/java/com/l2jserver/gameserver/model/quest/QuestState.java

@@ -412,13 +412,7 @@ public final class QuestState
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 
@@ -454,13 +448,7 @@ public final class QuestState
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		return result;
 	}
@@ -488,13 +476,7 @@ public final class QuestState
 		}
 		finally
 		{
-			try
-			{
-				con.close();
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 

L2_GameServer/java/com/l2jserver/gameserver/network/L2GameClient.java

@@ -297,7 +297,7 @@ public final class L2GameClient extends MMOClient<MMOConnection<L2GameClient>>
 		}
 		finally
 		{
-			try { con.close(); } catch (Exception e) {}
+			L2DatabaseFactory.close(con);
 		}
 	}
 
@@ -349,7 +349,7 @@ public final class L2GameClient extends MMOClient<MMOConnection<L2GameClient>>
 		}
 		finally
 		{
-			try { con.close(); } catch (Exception e) {}
+			L2DatabaseFactory.close(con);
 		}
 
 		LogRecord record = new LogRecord(Level.WARNING, "Restore");
@@ -487,7 +487,7 @@ public final class L2GameClient extends MMOClient<MMOConnection<L2GameClient>>
 		}
 		finally
 		{
-			try { con.close(); } catch (Exception e) {}
+			L2DatabaseFactory.close(con);
 		}
 	}
 

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestAnswerFriendInvite.java

@@ -96,7 +96,7 @@ public final class RequestAnswerFriendInvite extends L2GameClientPacket
         		}
         		finally
         		{
-        		    try { con.close(); } catch (Exception e) {}
+        		    L2DatabaseFactory.close(con);
         		}
     		} else
             {

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestBypassToServer.java

@@ -81,7 +81,7 @@ public final class RequestBypassToServer extends L2GameClientPacket
 		
 		if(_command.isEmpty())
 		{
-			_log.info(activeChar.getName()+" send empty requestbypass");			
+			_log.info(activeChar.getName()+" send empty requestbypass");
 			activeChar.logout();
 			return;
 		}

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestDestroyItem.java

@@ -168,7 +168,7 @@ public final class RequestDestroyItem extends L2GameClientPacket
 			}
 			finally
 			{
-				try { con.close(); } catch (Exception e) {}
+				L2DatabaseFactory.close(con);
 			}
 		}
 		if (itemToRemove.isTimeLimitedItem())

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestFriendDel.java

@@ -107,7 +107,7 @@ public final class RequestFriendDel extends L2GameClientPacket{
 		}
 		finally
 		{
-		    try { con.close(); } catch (Exception e) {}
+			L2DatabaseFactory.close(con);
 		}
 
 	}

L2_GameServer/java/com/l2jserver/gameserver/network/communityserver/readpackets/RequestWorldInfo.java

@@ -124,7 +124,7 @@ public final class RequestWorldInfo extends BaseReadPacket
 				}
 				finally
 				{
-					try { con.close(); } catch (Exception e) {}
+					L2DatabaseFactory.close(con);
 				}
 
 				// Castles data

L2_GameServer/java/com/l2jserver/gameserver/network/communityserver/writepackets/InitWorldInfo.java

@@ -118,7 +118,7 @@ public final class InitWorldInfo extends BaseWritePacket
 					}
 					finally
 					{
-						try {con.close();} catch (Exception e){}
+						L2DatabaseFactory.close(con);
 					}
 					super.writeD(list.size());
 					for (int j : list)

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/CharSelectionInfo.java

@@ -227,7 +227,7 @@ public class CharSelectionInfo extends L2GameServerPacket
         }
         finally
         {
-            try { con.close(); } catch (Exception e) {}
+            L2DatabaseFactory.close(con);
         }
         
         return new CharSelectInfoPackage[0];
@@ -262,7 +262,7 @@ public class CharSelectionInfo extends L2GameServerPacket
         }
         finally
         {
-            try { con.close(); } catch (Exception e) {}
+            try { L2DatabaseFactory.close(con); } catch (Exception e) {}
         }
         
     }
@@ -366,7 +366,7 @@ public class CharSelectionInfo extends L2GameServerPacket
             {
                 _log.log(Level.WARNING, "Could not restore augmentation info: " + e.getMessage(), e);
             }
-            finally { try { con.close(); } catch (Exception e) {} }
+            finally { try { L2DatabaseFactory.close(con); } catch (Exception e) {} }
         }
         
         /*

L2_GameServer/java/com/l2jserver/gameserver/taskmanager/TaskManager.java

@@ -101,13 +101,7 @@ public final class TaskManager
 			}
 			finally
 			{
-				try
-				{
-					con.close();
-				}
-				catch (Exception e)
-				{
-				}
+				L2DatabaseFactory.close(con);
 			}
 			
 			if (type == TYPE_SHEDULED || type == TYPE_TIME)
@@ -232,7 +226,7 @@ public final class TaskManager
 		{
 			try
 			{
-				con.close();
+				L2DatabaseFactory.close(con);
 			}
 			catch (Exception e)
 			{
@@ -369,7 +363,7 @@ public final class TaskManager
 		{
 			try
 			{
-				con.close();
+				L2DatabaseFactory.close(con);
 			}
 			catch (Exception e)
 			{
@@ -411,7 +405,7 @@ public final class TaskManager
 		{
 			try
 			{
-				con.close();
+				L2DatabaseFactory.close(con);
 			}
 			catch (Exception e)
 			{

L2_GameServer/java/com/l2jserver/gameserver/util/Evolve.java

@@ -226,7 +226,7 @@ public final class Evolve
 		}
 		finally
 		{
-			try { con.close(); } catch (Exception e) {}
+			L2DatabaseFactory.close(con);
 		}
 
 		return true;