BETA: Database connection cleanup:

	* Closed unclosed resources.
	* Using ARM for ImputStream.
	* Cleanup.

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

@@ -255,7 +255,6 @@ public class CrestCache
 				{
 					L2DatabaseFactory.close(con);
 				}
-				
 				clan.setCrestId(newId);
 			}
 			else

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

@@ -191,7 +191,6 @@ public class Forum
 		{
 			L2DatabaseFactory.close(con);
 		}
-		
 	}
 	
 	public int getTopicSize()

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

@@ -96,7 +96,6 @@ public class Post
 		{
 			L2DatabaseFactory.close(con);
 		}
-		
 	}
 	public Post(Topic t)
 	{

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

@@ -99,7 +99,6 @@ public class Topic
 		{
 			L2DatabaseFactory.close(con);
 		}
-		
 	}
 	
 	public enum ConstructorType

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

@@ -241,7 +241,6 @@ public class CharNameTable
 		{
 			L2DatabaseFactory.close(con);
 		}
-		
 		return number;
 	}
 	
@@ -250,12 +249,11 @@ public class CharNameTable
 		String name;
 		int id = -1;
 		int accessLevel = 0;
-		PreparedStatement statement = null;
 		Connection con = null;
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
-			statement = con.prepareStatement("SELECT charId,char_name,accesslevel FROM characters");
+			PreparedStatement statement = con.prepareStatement("SELECT charId,char_name,accesslevel FROM characters");
 			ResultSet rset = statement.executeQuery();
 			while (rset.next())
 			{

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/CharSummonTable.java

@@ -268,7 +268,6 @@ public class CharSummonTable
 			con = L2DatabaseFactory.getInstance().getConnection();
 			PreparedStatement statement = con.prepareStatement(REMOVE_SUMMON);
 			statement.setInt(1, activeChar.getObjectId());
-			
 			statement.execute();
 			statement.close();
 			_servitors.remove(activeChar.getObjectId());

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

@@ -452,7 +452,7 @@ public class NpcTable
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
-			PreparedStatement statement = null;
+			PreparedStatement statement;
 			if (id > 0)
 			{
 				statement = con.prepareStatement("SELECT * FROM npc WHERE id = ?");
@@ -521,7 +521,7 @@ public class NpcTable
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
-			PreparedStatement statement = null;
+			PreparedStatement statement;
 			if (id > 0)
 			{
 				statement = con.prepareStatement("SELECT * FROM npcskills WHERE npcid = ?");
@@ -757,8 +757,7 @@ public class NpcTable
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
-			PreparedStatement statement = null;
-			
+			PreparedStatement statement;
 			if (id > 0)
 			{
 				statement = con.prepareStatement("SELECT * FROM skill_learn WHERE npc_id = ?");

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

@@ -189,7 +189,6 @@ public class CursedWeaponsManager
 			
 			PreparedStatement statement = con.prepareStatement("SELECT itemId, charId, playerKarma, playerPkKills, nbKills, endTime FROM cursed_weapons");
 			ResultSet rset = statement.executeQuery();
-			
 			while (rset.next())
 			{
 				int itemId = rset.getInt("itemId");
@@ -217,8 +216,6 @@ public class CursedWeaponsManager
 		catch (Exception e)
 		{
 			_log.log(Level.WARNING, "Could not restore CursedWeapons data: " + e.getMessage(), e);
-			
-			return;
 		}
 		finally
 		{
@@ -315,7 +312,6 @@ public class CursedWeaponsManager
 		{
 			L2DatabaseFactory.close(con);
 		}
-		
 		if (Config.DEBUG)
 			_log.info("DONE");
 	}

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/HellboundManager.java

@@ -301,6 +301,7 @@ public class HellboundManager
 				}
 			}
 			rset.close();
+			statement.close();
 		}
 		catch (Exception e)
 		{

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

@@ -297,7 +297,7 @@ public class ItemsOnGroundManager
 			
 			if (Config.DEBUG)
 			{
-				_log.warning("ItemsOnGroundManager: " + _items.size() + " items on ground saved");
+				_log.info(getClass().getSimpleName() + ": Saved " + _items.size() + " items on ground.");
 			}
 		}
 	}

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

@@ -177,11 +177,10 @@ public class MailManager
 		_messages.put(msg.getId(), msg);
 		
 		Connection con = null;
-		PreparedStatement stmt = null;
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
-			stmt = Message.getStatement(msg, con);
+			PreparedStatement stmt = Message.getStatement(msg, con);
 			stmt.execute();
 			stmt.close();
 		}
@@ -253,11 +252,10 @@ public class MailManager
 	public final void markAsReadInDb(int msgId)
 	{
 		Connection con = null;
-		PreparedStatement stmt = null;
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
-			stmt = con.prepareStatement("UPDATE messages SET isUnread = 'false' WHERE messageId = ?");
+			PreparedStatement stmt = con.prepareStatement("UPDATE messages SET isUnread = 'false' WHERE messageId = ?");
 			stmt.setInt(1, msgId);
 			stmt.execute();
 			stmt.close();
@@ -325,12 +323,11 @@ public class MailManager
 	public final void removeAttachmentsInDb(int msgId)
 	{
 		Connection con = null;
-		PreparedStatement stmt = null;
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
 			
-			stmt = con.prepareStatement("UPDATE messages SET hasAttachments = 'false' WHERE messageId = ?");
+			PreparedStatement stmt = con.prepareStatement("UPDATE messages SET hasAttachments = 'false' WHERE messageId = ?");
 			
 			stmt.setInt(1, msgId);
 			
@@ -350,12 +347,11 @@ public class MailManager
 	public final void deleteMessageInDb(int msgId)
 	{
 		Connection con = null;
-		PreparedStatement stmt = null;
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
 			
-			stmt = con.prepareStatement("DELETE FROM messages WHERE messageId = ?");
+			PreparedStatement stmt = con.prepareStatement("DELETE FROM messages WHERE messageId = ?");
 			
 			stmt.setInt(1, msgId);
 			
@@ -370,7 +366,6 @@ public class MailManager
 		{
 			L2DatabaseFactory.close(con);
 		}
-		
 		_messages.remove(msgId);
 		IdFactory.getInstance().releaseId(msgId);
 	}

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

@@ -101,8 +101,7 @@ public class RaidBossPointsManager
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
-			PreparedStatement statement;
-			statement = con.prepareStatement("REPLACE INTO character_raid_points (`charId`,`boss_id`,`points`) VALUES (?,?,?)");
+			PreparedStatement statement = con.prepareStatement("REPLACE INTO character_raid_points (`charId`,`boss_id`,`points`) VALUES (?,?,?)");
 			statement.setInt(1, player.getObjectId());
 			statement.setInt(2, raidId);
 			statement.setInt(3, points);
@@ -166,8 +165,7 @@ public class RaidBossPointsManager
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
-			PreparedStatement statement;
-			statement = con.prepareStatement("DELETE from character_raid_points WHERE charId > 0");
+			final PreparedStatement statement = con.prepareStatement("DELETE from character_raid_points WHERE charId > 0");
 			statement.executeUpdate();
 			statement.close();
 			_list.clear();

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

@@ -700,10 +700,9 @@ public class TerritoryWarManager implements Siegable
 	
 	private final void load()
 	{
-		InputStream is = null;
-		try
+		
+		try (InputStream is = new FileInputStream(new File(Config.TW_CONFIGURATION_FILE)))
 		{
-			is = new FileInputStream(new File(Config.TW_CONFIGURATION_FILE));
 			L2Properties territoryWarSettings = new L2Properties();
 			territoryWarSettings.load(is);
 			
@@ -842,16 +841,6 @@ public class TerritoryWarManager implements Siegable
 			//_initialized = false;
 			_log.log(Level.WARNING, "Error while loading Territory War Manager! " + e.getMessage(), e);
 		}
-		finally
-		{
-			try
-			{
-				is.close();
-			}
-			catch (Exception e)
-			{
-			}
-		}
 	}
 	
 	private void startTerritoryWar()

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

@@ -91,8 +91,7 @@ public class Lottery
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
-			PreparedStatement statement;
-			statement = con.prepareStatement(UPDATE_PRICE);
+			PreparedStatement statement = con.prepareStatement(UPDATE_PRICE);
 			statement.setLong(1, getPrize());
 			statement.setLong(2, getPrize());
 			statement.setInt(3, getId());
@@ -556,7 +555,6 @@ public class Lottery
 		{
 			L2DatabaseFactory.close(con);
 		}
-		
 		return res;
 	}
 	

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

@@ -126,18 +126,12 @@ public class AutoSpawnHandler
 		
 		try
 		{
-			PreparedStatement statement = null;
-			PreparedStatement statement2 = null;
-			ResultSet rs = null;
-			ResultSet rs2 = null;
-			
 			con = L2DatabaseFactory.getInstance().getConnection();
 			
 			// Restore spawn group data, then the location data.
-			statement = con.prepareStatement("SELECT * FROM random_spawn ORDER BY groupId ASC");
-			rs = statement.executeQuery();
-			
-			statement2 = con.prepareStatement("SELECT * FROM random_spawn_loc WHERE groupId=?");
+			PreparedStatement statement = con.prepareStatement("SELECT * FROM random_spawn ORDER BY groupId ASC");
+			ResultSet rs = statement.executeQuery();
+			PreparedStatement statement2 = con.prepareStatement("SELECT * FROM random_spawn_loc WHERE groupId=?");
 			while (rs.next())
 			{
 				// Register random spawn group, set various options on the
@@ -151,7 +145,7 @@ public class AutoSpawnHandler
 				
 				// Restore the spawn locations for this spawn group/instance.
 				statement2.setInt(1, rs.getInt("groupId"));
-				rs2 = statement2.executeQuery();
+				ResultSet rs2 = statement2.executeQuery();
 				statement2.clearParameters();
 				
 				while (rs2.next())

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

@@ -897,7 +897,7 @@ public class L2Clan
 	 * 	<li>Clan leader Id</li>
 	 * 	<li>Clan crest Id</li>
 	 * 	<li>Clan large crest Id</li>
-	 * 	<li>Allaince crest Id</li>
+	 * 	<li>Alliance crest Id</li>
 	 * </ul>
 	 */
 	public void store()
@@ -940,11 +940,10 @@ public class L2Clan
 	private void removeMemberInDatabase(L2ClanMember member, long clanJoinExpiryTime, long clanCreateExpiryTime)
 	{
 		Connection con = null;
-		PreparedStatement statement = null;
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
-			statement = con.prepareStatement("UPDATE characters SET clanid=0, title=?, clan_join_expiry_time=?, clan_create_expiry_time=?, clan_privs=0, wantspeace=0, subpledge=0, lvl_joined_academy=0, apprentice=0, sponsor=0 WHERE charId=?");
+			PreparedStatement statement = con.prepareStatement("UPDATE characters SET clanid=0, title=?, clan_join_expiry_time=?, clan_create_expiry_time=?, clan_privs=0, wantspeace=0, subpledge=0, lvl_joined_academy=0, apprentice=0, sponsor=0 WHERE charId=?");
 			statement.setString(1, "");
 			statement.setLong(2, clanJoinExpiryTime);
 			statement.setLong(3, clanCreateExpiryTime);
@@ -1100,7 +1099,6 @@ public class L2Clan
 		{
 			L2DatabaseFactory.close(con);
 		}
-		
 	}
 	
 	private void storeNotice(String notice, boolean enabled)
@@ -1930,7 +1928,6 @@ public class L2Clan
 			_privs.get(rank).setPrivs(privs);
 			
 			Connection con = null;
-			
 			try
 			{
 				//_log.warning("requested store clan privs in db for rank: "+rank+", privs: "+privs);
@@ -1942,7 +1939,6 @@ public class L2Clan
 				statement.setInt(3, 0);
 				statement.setInt(4, privs);
 				statement.setInt(5, privs);
-				
 				statement.execute();
 				statement.close();
 			}

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

@@ -624,7 +624,6 @@ public class L2ClanMember
 	public void saveApprenticeAndSponsor(int apprentice, int sponsor)
 	{
 		Connection con = null;
-		
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2ContactList.java

@@ -180,7 +180,6 @@ public class L2ContactList
 		_contacts.remove(name);
 		
 		Connection con = null;
-		
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();

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

@@ -3179,7 +3179,6 @@ public final class L2PcInstance extends L2Playable
 			PreparedStatement statement = con.prepareStatement(LOAD_ZONE_RESTART_LIMIT);
 			statement.setInt(1, getObjectId());
 			final ResultSet rset = statement.executeQuery();
-			
 			if (rset.next())
 			{
 				setZoneRestartLimitTime(rset.getLong("time_limit"));
@@ -7595,15 +7594,12 @@ public final class L2PcInstance extends L2Playable
 	private static boolean restoreSubClassData(L2PcInstance player)
 	{
 		Connection con = null;
-		
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
 			PreparedStatement statement = con.prepareStatement(RESTORE_CHAR_SUBCLASSES);
 			statement.setInt(1, player.getObjectId());
-			
 			ResultSet rset = statement.executeQuery();
-			
 			while (rset.next())
 			{
 				SubClass subClass = new SubClass();
@@ -7627,7 +7623,6 @@ public final class L2PcInstance extends L2Playable
 		{
 			L2DatabaseFactory.close(con);
 		}
-		
 		return true;
 	}
 	
@@ -7839,7 +7834,6 @@ public final class L2PcInstance extends L2Playable
 	private void storeCharBase()
 	{
 		Connection con = null;
-		
 		try
 		{
 			// Get the exp, level, and sp of base class to store in base table
@@ -10918,14 +10912,12 @@ public final class L2PcInstance extends L2Playable
 				_log.info(getName() + " has requested to modify sub class index " + classIndex + " from class ID " + oldClassId + " to " + newClassId + ".");
 			
 			Connection con = null;
-			PreparedStatement statement = null;
-			
 			try
 			{
 				con = L2DatabaseFactory.getInstance().getConnection();
 				
 				// Remove all henna info stored for this sub-class.
-				statement = con.prepareStatement(DELETE_CHAR_HENNAS);
+				PreparedStatement statement = con.prepareStatement(DELETE_CHAR_HENNAS);
 				statement.setInt(1, getObjectId());
 				statement.setInt(2, classIndex);
 				statement.execute();
@@ -14285,7 +14277,6 @@ public final class L2PcInstance extends L2Playable
 				tpbookmark.get(count)._name = name;
 				
 				Connection con = null;
-				
 				try
 				{
 					
@@ -14309,7 +14300,6 @@ public final class L2PcInstance extends L2Playable
 				{
 					L2DatabaseFactory.close(con);
 				}
-				
 			}
 			count++;
 		}
@@ -14542,7 +14532,6 @@ public final class L2PcInstance extends L2Playable
 		{
 			L2DatabaseFactory.close(con);
 		}
-		
 		sendPacket(new ExGetBookMarkInfoPacket(this));
 	}
 	
@@ -14551,7 +14540,6 @@ public final class L2PcInstance extends L2Playable
 		if(tpbookmark == null)
 			tpbookmark = new FastList<TeleportBookmark>();
 		Connection con = null;
-		
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();

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

@@ -168,14 +168,11 @@ public class Auction
 		Connection con = null;
 		try
 		{
-			PreparedStatement statement;
-			ResultSet rs;
-			
 			con = L2DatabaseFactory.getInstance().getConnection();
 			
-			statement = con.prepareStatement("Select * from auction where id = ?");
+			PreparedStatement statement = con.prepareStatement("Select * from auction where id = ?");
 			statement.setInt(1, getId());
-			rs = statement.executeQuery();
+			ResultSet rs = statement.executeQuery();
 			
 			while (rs.next())
 			{
@@ -214,14 +211,11 @@ public class Auction
 		Connection con = null;
 		try
 		{
-			PreparedStatement statement;
-			ResultSet rs;
-			
 			con = L2DatabaseFactory.getInstance().getConnection();
 			
-			statement = con.prepareStatement("SELECT bidderId, bidderName, maxBid, clan_name, time_bid FROM auction_bid WHERE auctionId = ? ORDER BY maxBid DESC");
+			PreparedStatement statement = con.prepareStatement("SELECT bidderId, bidderName, maxBid, clan_name, time_bid FROM auction_bid WHERE auctionId = ? ORDER BY maxBid DESC");
 			statement.setInt(1, getId());
-			rs = statement.executeQuery();
+			ResultSet rs = statement.executeQuery();
 			
 			while (rs.next())
 			{
@@ -360,7 +354,6 @@ public class Auction
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
 			PreparedStatement statement;
-			
 			if (getBidders().get(bidder.getClanId()) != null)
 			{
 				statement = con.prepareStatement("UPDATE auction_bid SET bidderId=?, bidderName=?, maxBid=?, time_bid=? WHERE auctionId=? AND bidderId=?");
@@ -370,8 +363,6 @@ public class Auction
 				statement.setLong(4, System.currentTimeMillis());
 				statement.setInt(5, getId());
 				statement.setInt(6, bidder.getClanId());
-				statement.execute();
-				statement.close();
 			}
 			else
 			{
@@ -383,11 +374,12 @@ public class Auction
 				statement.setLong(5, bid);
 				statement.setString(6, bidder.getClan().getName());
 				statement.setLong(7, System.currentTimeMillis());
-				statement.execute();
-				statement.close();
 				if (L2World.getInstance().getPlayer(_highestBidderName) != null)
 					L2World.getInstance().getPlayer(_highestBidderName).sendMessage("You have been out bidded");
 			}
+			statement.execute();
+			statement.close();
+			
 			_highestBidderId = bidder.getClanId();
 			_highestBidderMaxBid = bid;
 			_highestBidderName = bidder.getClan().getLeaderName();
@@ -417,9 +409,7 @@ public class Auction
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
-			PreparedStatement statement;
-			
-			statement = con.prepareStatement("DELETE FROM auction_bid WHERE auctionId=?");
+			PreparedStatement statement = con.prepareStatement("DELETE FROM auction_bid WHERE auctionId=?");
 			statement.setInt(1, getId());
 			statement.execute();
 			
@@ -455,8 +445,7 @@ public class Auction
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
-			PreparedStatement statement;
-			statement = con.prepareStatement("DELETE FROM auction WHERE itemId=?");
+			PreparedStatement statement = con.prepareStatement("DELETE FROM auction WHERE itemId=?");
 			statement.setInt(1, _itemId);
 			statement.execute();
 			statement.close();

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

@@ -704,14 +704,11 @@ public class Castle
 		Connection con = null;
 		try
 		{
-			PreparedStatement statement;
-			ResultSet rs;
-			
 			con = L2DatabaseFactory.getInstance().getConnection();
 			
-			statement = con.prepareStatement("Select * from castle where id = ?");
+			PreparedStatement statement = con.prepareStatement("Select * from castle where id = ?");
 			statement.setInt(1, getCastleId());
-			rs = statement.executeQuery();
+			ResultSet rs = statement.executeQuery();
 			
 			while (rs.next())
 			{
@@ -802,9 +799,8 @@ public class Castle
 		Connection con = null;
 		try
 		{
-			PreparedStatement statement;
 			con = L2DatabaseFactory.getInstance().getConnection();
-			statement = con.prepareStatement("DELETE FROM castle_functions WHERE castle_id=? AND type=?");
+			PreparedStatement statement = con.prepareStatement("DELETE FROM castle_functions WHERE castle_id=? AND type=?");
 			statement.setInt(1, getCastleId());
 			statement.setInt(2, functionType);
 			statement.execute();
@@ -987,11 +983,9 @@ public class Castle
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
-			PreparedStatement statement;
-			
 			// NEED TO REMOVE HAS CASTLE FLAG FROM CLAN_DATA
 			// SHOULD BE CHECKED FROM CASTLE TABLE
-			statement = con.prepareStatement("UPDATE clan_data SET hasCastle = 0 WHERE hasCastle = ?");
+			PreparedStatement statement = con.prepareStatement("UPDATE clan_data SET hasCastle = 0 WHERE hasCastle = ?");
 			statement.setInt(1, getCastleId());
 			statement.execute();
 			statement.close();
@@ -1002,7 +996,7 @@ public class Castle
 			statement.execute();
 			statement.close();
 			
-			// Announce to clan memebers
+			// Announce to clan members
 			if (clan != null)
 			{
 				clan.setCastleId(getCastleId()); // Set has castle flag for new owner
@@ -1203,13 +1197,11 @@ public class Castle
 	public void saveSeedData()
 	{
 		Connection con = null;
-		PreparedStatement statement;
-		
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
 			
-			statement = con.prepareStatement(CASTLE_MANOR_DELETE_PRODUCTION);
+			PreparedStatement statement = con.prepareStatement(CASTLE_MANOR_DELETE_PRODUCTION);
 			statement.setInt(1, getCastleId());
 			
 			statement.execute();
@@ -1275,12 +1267,11 @@ public class Castle
 	public void saveSeedData(int period)
 	{
 		Connection con = null;
-		PreparedStatement statement;
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
 			
-			statement = con.prepareStatement(CASTLE_MANOR_DELETE_PRODUCTION_PERIOD);
+			PreparedStatement statement = con.prepareStatement(CASTLE_MANOR_DELETE_PRODUCTION_PERIOD);
 			statement.setInt(1, getCastleId());
 			statement.setInt(2, period);
 			statement.execute();
@@ -1326,12 +1317,11 @@ public class Castle
 	public void saveCropData()
 	{
 		Connection con = null;
-		PreparedStatement statement;
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
 			
-			statement = con.prepareStatement(CASTLE_MANOR_DELETE_PROCURE);
+			PreparedStatement statement = con.prepareStatement(CASTLE_MANOR_DELETE_PROCURE);
 			statement.setInt(1, getCastleId());
 			statement.execute();
 			statement.close();
@@ -1394,12 +1384,11 @@ public class Castle
 	public void saveCropData(int period)
 	{
 		Connection con = null;
-		PreparedStatement statement;
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
 			
-			statement = con.prepareStatement(CASTLE_MANOR_DELETE_PROCURE_PERIOD);
+			PreparedStatement statement = con.prepareStatement(CASTLE_MANOR_DELETE_PROCURE_PERIOD);
 			statement.setInt(1, getCastleId());
 			statement.setInt(2, period);
 			statement.execute();
@@ -1446,12 +1435,11 @@ public class Castle
 	public void updateCrop(int cropId, long amount, int period)
 	{
 		Connection con = null;
-		PreparedStatement statement;
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
 			
-			statement = con.prepareStatement(CASTLE_UPDATE_CROP);
+			PreparedStatement statement = con.prepareStatement(CASTLE_UPDATE_CROP);
 			statement.setLong(1, amount);
 			statement.setInt(2, cropId);
 			statement.setInt(3, getCastleId());
@@ -1472,12 +1460,11 @@ public class Castle
 	public void updateSeed(int seedId, long amount, int period)
 	{
 		Connection con = null;
-		PreparedStatement statement;
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
 			
-			statement = con.prepareStatement(CASTLE_UPDATE_SEED);
+			PreparedStatement statement = con.prepareStatement(CASTLE_UPDATE_SEED);
 			statement.setLong(1, amount);
 			statement.setInt(2, seedId);
 			statement.setInt(3, getCastleId());
@@ -1533,12 +1520,11 @@ public class Castle
 	public void updateShowNpcCrest()
 	{
 		Connection con = null;
-		PreparedStatement statement;
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
 			
-			statement = con.prepareStatement("UPDATE castle SET showNpcCrest = ? WHERE id = ?");
+			PreparedStatement statement = con.prepareStatement("UPDATE castle SET showNpcCrest = ? WHERE id = ?");
 			statement.setString(1, String.valueOf(getShowNpcCrest()));
 			statement.setInt(2, getCastleId());
 			statement.execute();

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

@@ -419,12 +419,10 @@ public abstract class ClanHall
 		Connection con = null;
 		try
 		{
-			PreparedStatement statement;
-			ResultSet rs;
 			con = L2DatabaseFactory.getInstance().getConnection();
-			statement = con.prepareStatement("Select * from clanhall_functions where hall_id = ?");
+			PreparedStatement statement = con.prepareStatement("Select * from clanhall_functions where hall_id = ?");
 			statement.setInt(1, getId());
-			rs = statement.executeQuery();
+			ResultSet rs = statement.executeQuery();
 			while (rs.next())
 			{
 				_functions.put(rs.getInt("type"), new ClanHallFunction(rs.getInt("type"), rs.getInt("lvl"), rs.getInt("lease"), 0, rs.getLong("rate"), rs.getLong("endTime"), true));
@@ -452,9 +450,8 @@ public abstract class ClanHall
 		Connection con = null;
 		try
 		{
-			PreparedStatement statement;
 			con = L2DatabaseFactory.getInstance().getConnection();
-			statement = con.prepareStatement("DELETE FROM clanhall_functions WHERE hall_id=? AND type=?");
+			PreparedStatement statement = con.prepareStatement("DELETE FROM clanhall_functions WHERE hall_id=? AND type=?");
 			statement.setInt(1, getId());
 			statement.setInt(2, functionType);
 			statement.execute();

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

@@ -126,9 +126,7 @@ public class Couple
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
-			PreparedStatement statement;
-			
-			statement = con.prepareStatement("UPDATE mods_wedding set married = ?, weddingDate = ? where id = ?");
+			PreparedStatement statement = con.prepareStatement("UPDATE mods_wedding set married = ?, weddingDate = ? where id = ?");
 			statement.setBoolean(1, true);
 			_weddingDate = Calendar.getInstance();
 			statement.setLong(2, _weddingDate.getTimeInMillis());
@@ -153,9 +151,7 @@ public class Couple
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
-			PreparedStatement statement;
-			
-			statement = con.prepareStatement("DELETE FROM mods_wedding WHERE id=?");
+			PreparedStatement statement = con.prepareStatement("DELETE FROM mods_wedding WHERE id=?");
 			statement.setInt(1, _Id);
 			statement.execute();
 			statement.close();

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

@@ -545,9 +545,7 @@ public class Fort
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
-			PreparedStatement statement;
-			
-			statement = con.prepareStatement("UPDATE fort SET blood=?, supplyLvL=? WHERE id = ?");
+			PreparedStatement statement = con.prepareStatement("UPDATE fort SET blood=?, supplyLvL=? WHERE id = ?");
 			statement.setInt(1, _blood);
 			statement.setInt(2, _supplyLvL);
 			statement.setInt(3, getFortId());
@@ -613,14 +611,11 @@ public class Fort
 		Connection con = null;
 		try
 		{
-			PreparedStatement statement;
-			ResultSet rs;
-			
 			con = L2DatabaseFactory.getInstance().getConnection();
 			
-			statement = con.prepareStatement("SELECT * FROM fort WHERE id = ?");
+			PreparedStatement statement = con.prepareStatement("SELECT * FROM fort WHERE id = ?");
 			statement.setInt(1, getFortId());
-			rs = statement.executeQuery();
+			ResultSet rs = statement.executeQuery();
 			int ownerId = 0;
 			
 			while (rs.next())
@@ -714,9 +709,8 @@ public class Fort
 		Connection con = null;
 		try
 		{
-			PreparedStatement statement;
 			con = L2DatabaseFactory.getInstance().getConnection();
-			statement = con.prepareStatement("DELETE FROM fort_functions WHERE fort_id=? AND type=?");
+			PreparedStatement statement = con.prepareStatement("DELETE FROM fort_functions WHERE fort_id=? AND type=?");
 			statement.setInt(1, getFortId());
 			statement.setInt(2, functionType);
 			statement.execute();
@@ -934,9 +928,7 @@ public class Fort
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
-			PreparedStatement statement;
-			
-			statement = con.prepareStatement("UPDATE fort SET owner=?,lastOwnedTime=?,state=?,castleId=?,blood=? WHERE id = ?");
+			PreparedStatement statement = con.prepareStatement("UPDATE fort SET owner=?,lastOwnedTime=?,state=?,castleId=?,blood=? WHERE id = ?");
 			statement.setInt(1, clanId);
 			statement.setLong(2, _lastOwnedTime.getTimeInMillis());
 			statement.setInt(3, 0);
@@ -1134,15 +1126,12 @@ public class Fort
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
-			PreparedStatement statement;
-			
-			statement = con.prepareStatement("UPDATE fort SET state=?,castleId=? WHERE id = ?");
+			PreparedStatement statement = con.prepareStatement("UPDATE fort SET state=?,castleId=? WHERE id = ?");
 			statement.setInt(1, getFortState());
 			statement.setInt(2, getCastleId());
 			statement.setInt(3, getFortId());
 			statement.execute();
 			statement.close();
-			
 		}
 		catch (Exception e)
 		{

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

@@ -479,11 +479,10 @@ public class FortSiege implements Siegable
 	public void clearSiegeClan()
 	{
 		Connection con = null;
-		PreparedStatement statement = null;
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
-			statement = con.prepareStatement("DELETE FROM fortsiege_clans WHERE fort_id=?");
+			PreparedStatement statement = con.prepareStatement("DELETE FROM fortsiege_clans WHERE fort_id=?");
 			statement.setInt(1, getFort().getFortId());
 			statement.execute();
 			statement.close();
@@ -955,25 +954,19 @@ public class FortSiege implements Siegable
 	private void loadSiegeClan()
 	{
 		Connection con = null;
-		PreparedStatement statement = null;
 		try
 		{
 			getAttackerClans().clear();
-			
-			ResultSet rs = null;
-			
 			con = L2DatabaseFactory.getInstance().getConnection();
-			
-			statement = con.prepareStatement("SELECT clan_id FROM fortsiege_clans WHERE fort_id=?");
+			PreparedStatement statement = con.prepareStatement("SELECT clan_id FROM fortsiege_clans WHERE fort_id=?");
 			statement.setInt(1, getFort().getFortId());
-			rs = statement.executeQuery();
-			
+			ResultSet rs = statement.executeQuery();
 			while (rs.next())
 			{
 				addAttacker(rs.getInt("clan_id"));
 			}
-			
 			rs.close();
+			statement.close();
 		}
 		catch (Exception e)
 		{

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

@@ -1073,7 +1073,6 @@ public class Hero
 	private void deleteItemsInDb()
 	{
 		Connection con = null;
-		
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();

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

@@ -668,11 +668,10 @@ public class Siege implements Siegable
 	public void clearSiegeClan()
 	{
 		Connection con = null;
-		PreparedStatement statement = null;
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
-			statement = con.prepareStatement("DELETE FROM siege_clans WHERE castle_id=?");
+			PreparedStatement statement = con.prepareStatement("DELETE FROM siege_clans WHERE castle_id=?");
 			statement.setInt(1, getCastle().getCastleId());
 			statement.execute();
 			statement.close();

L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/clanhall/AuctionableHall.java

@@ -199,9 +199,7 @@ public final class AuctionableHall extends ClanHall
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
-			PreparedStatement statement;
-			
-			statement = con.prepareStatement("UPDATE clanhall SET ownerId=?, paidUntil=?, paid=? WHERE id=?");
+			PreparedStatement statement = con.prepareStatement("UPDATE clanhall SET ownerId=?, paidUntil=?, paid=? WHERE id=?");
 			statement.setInt(1, getOwnerId());
 			statement.setLong(2, getPaidUntil());
 			statement.setInt(3, (getPaid()) ? 1 : 0);

L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java

@@ -158,7 +158,6 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable
 		if(_guards == null)
 		{
 			_guards = new FastList<L2Spawn>();
-		
 			Connection con = null;
 			try
 			{

L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/clanhall/SiegableHall.java

@@ -121,9 +121,7 @@ public final class SiegableHall extends ClanHall
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
-			PreparedStatement statement;
-			
-			statement = con.prepareStatement(SQL_SAVE);
+			PreparedStatement statement = con.prepareStatement(SQL_SAVE);
 			statement.setInt(1, getOwnerId());
 			statement.setLong(2, getNextSiegeTime());
 			statement.setInt(3, getId());

L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemauction/ItemAuction.java

@@ -241,7 +241,6 @@ public final class ItemAuction
 				statement.setLong(3, bid.getLastBid());
 				statement.setLong(4, bid.getLastBid());
 			}
-			
 			statement.execute();
 			statement.close();
 		}

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

@@ -117,11 +117,10 @@ public class Mail extends ItemContainer
 	public void restore()
 	{
 		Connection con = null;
-		PreparedStatement statement = null;
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
-			statement = con.prepareStatement("SELECT object_id, item_id, count, enchant_level, loc, loc_data, custom_type1, custom_type2, mana_left, time FROM items WHERE owner_id=? AND loc=? AND loc_data=?");
+			PreparedStatement statement = con.prepareStatement("SELECT object_id, item_id, count, enchant_level, loc, loc_data, custom_type1, custom_type2, mana_left, time FROM items WHERE owner_id=? AND loc=? AND loc_data=?");
 			statement.setInt(1, getOwnerId());
 			statement.setString(2, getBaseLocation().name());
 			statement.setInt(3, getMessageId());
@@ -142,6 +141,7 @@ public class Mail extends ItemContainer
 				else
 					addItem(item);
 			}
+			inv.close();
 			statement.close();
 		}
 		catch (Exception e)

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

@@ -726,12 +726,10 @@ public class PcInventory extends Inventory
 	{
 		int[][] paperdoll = new int[31][3];
 		Connection con = null;
-		
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
-			PreparedStatement statement2 = con.prepareStatement(
-			"SELECT object_id,item_id,loc_data,enchant_level FROM items WHERE owner_id=? AND loc='PAPERDOLL'");
+			PreparedStatement statement2 = con.prepareStatement("SELECT object_id,item_id,loc_data,enchant_level FROM items WHERE owner_id=? AND loc='PAPERDOLL'");
 			statement2.setInt(1, objectId);
 			ResultSet invdata = statement2.executeQuery();
 			

L2J_Server_BETA/java/com/l2jserver/gameserver/model/items/instance/L2ItemInstance.java

@@ -1643,11 +1643,10 @@ public final class L2ItemInstance extends L2Object
 			return;
 		
 		Connection con = null;
-		PreparedStatement statement = null;
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
-			statement = con.prepareStatement("UPDATE items SET owner_id=?,count=?,loc=?,loc_data=?,enchant_level=?,custom_type1=?,custom_type2=?,mana_left=?,time=? " + "WHERE object_id = ?");
+			PreparedStatement statement = con.prepareStatement("UPDATE items SET owner_id=?,count=?,loc=?,loc_data=?,enchant_level=?,custom_type1=?,custom_type2=?,mana_left=?,time=? " + "WHERE object_id = ?");
 			statement.setInt(1, _ownerId);
 			statement.setLong(2, getCount());
 			statement.setString(3, _loc.name());
@@ -1684,11 +1683,10 @@ public final class L2ItemInstance extends L2Object
 			return;
 		
 		Connection con = null;
-		PreparedStatement statement = null;
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
-			statement = con.prepareStatement("INSERT INTO items (owner_id,item_id,count,loc,loc_data,enchant_level,object_id,custom_type1,custom_type2,mana_left,time) " + "VALUES (?,?,?,?,?,?,?,?,?,?,?)");
+			PreparedStatement statement = con.prepareStatement("INSERT INTO items (owner_id,item_id,count,loc,loc_data,enchant_level,object_id,custom_type1,custom_type2,mana_left,time) " + "VALUES (?,?,?,?,?,?,?,?,?,?,?)");
 			statement.setInt(1, _ownerId);
 			statement.setInt(2, _itemId);
 			statement.setLong(3, getCount());
@@ -1732,11 +1730,10 @@ public final class L2ItemInstance extends L2Object
 			return;
 		
 		Connection con = null;
-		PreparedStatement statement = null;
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
-			statement = con.prepareStatement("DELETE FROM items WHERE object_id = ?");
+			PreparedStatement statement = con.prepareStatement("DELETE FROM items WHERE object_id = ?");
 			statement.setInt(1, getObjectId());
 			statement.executeUpdate();
 			_existsInDb = false;

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

@@ -214,10 +214,9 @@ public class Olympiad
 			_log.log(Level.INFO, "Olympiad System: failed to load data from database, trying to load from file.");
 			
 			Properties OlympiadProperties = new Properties();
-			InputStream is = null;
-			try
+			try (InputStream is = new FileInputStream(new File("./" + OLYMPIAD_DATA_FILE)))
 			{
-				is = new FileInputStream(new File("./" + OLYMPIAD_DATA_FILE));
+				
 				OlympiadProperties.load(is);
 			}
 			catch (Exception e)
@@ -225,17 +224,6 @@ public class Olympiad
 				_log.log(Level.SEVERE, "Olympiad System: Error loading olympiad properties: ", e);
 				return;
 			}
-			finally
-			{
-				try
-				{
-					is.close();
-				}
-				catch (Exception e)
-				{
-					_log.log(Level.WARNING, "", e);
-				}
-			}
 			
 			_currentCycle = Integer.parseInt(OlympiadProperties.getProperty("CurrentCycle", "1"));
 			_period = Integer.parseInt(OlympiadProperties.getProperty("Period", "0"));

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

@@ -1432,8 +1432,7 @@ public class Quest extends ManagedScript
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
-			PreparedStatement statement;
-			statement = con.prepareStatement("REPLACE INTO quest_global_data (quest_name,var,value) VALUES (?,?,?)");
+			PreparedStatement statement = con.prepareStatement("REPLACE INTO quest_global_data (quest_name,var,value) VALUES (?,?,?)");
 			statement.setString(1, getName());
 			statement.setString(2, var);
 			statement.setString(3, value);
@@ -1499,8 +1498,7 @@ public class Quest extends ManagedScript
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
-			PreparedStatement statement;
-			statement = con.prepareStatement("DELETE FROM quest_global_data WHERE quest_name = ? AND var = ?");
+			PreparedStatement statement = con.prepareStatement("DELETE FROM quest_global_data WHERE quest_name = ? AND var = ?");
 			statement.setString(1, getName());
 			statement.setString(2, var);
 			statement.executeUpdate();
@@ -1553,8 +1551,7 @@ public class Quest extends ManagedScript
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
-			PreparedStatement statement;
-			statement = con.prepareStatement("INSERT INTO character_quests (charId,name,var,value) VALUES (?,?,?,?) ON DUPLICATE KEY UPDATE value=?");
+			PreparedStatement statement = con.prepareStatement("INSERT INTO character_quests (charId,name,var,value) VALUES (?,?,?,?) ON DUPLICATE KEY UPDATE value=?");
 			statement.setInt(1, qs.getPlayer().getObjectId());
 			statement.setString(2, qs.getQuestName());
 			statement.setString(3, var);
@@ -1585,8 +1582,7 @@ public class Quest extends ManagedScript
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
-			PreparedStatement statement;
-			statement = con.prepareStatement("UPDATE character_quests SET value=? WHERE charId=? AND name=? AND var = ?");
+			PreparedStatement statement = con.prepareStatement("UPDATE character_quests SET value=? WHERE charId=? AND name=? AND var = ?");
 			statement.setString(1, value);
 			statement.setInt(2, qs.getPlayer().getObjectId());
 			statement.setString(3, qs.getQuestName());
@@ -1643,8 +1639,7 @@ public class Quest extends ManagedScript
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
-			PreparedStatement statement;
-			statement = con.prepareStatement("DELETE FROM character_quests WHERE charId=? AND name=?");
+			PreparedStatement statement = con.prepareStatement("DELETE FROM character_quests WHERE charId=? AND name=?");
 			statement.setInt(1, qs.getPlayer().getObjectId());
 			statement.setString(2, qs.getQuestName());
 			statement.executeUpdate();

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

@@ -441,8 +441,7 @@ public final class QuestState
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
-			PreparedStatement statement;
-			statement = con.prepareStatement("REPLACE INTO character_quest_global_data (charId,var,value) VALUES (?,?,?)");
+			PreparedStatement statement = con.prepareStatement("REPLACE INTO character_quest_global_data (charId,var,value) VALUES (?,?,?)");
 			statement.setInt(1, _player.getObjectId());
 			statement.setString(2, var);
 			statement.setString(3, value);
@@ -508,8 +507,7 @@ public final class QuestState
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
-			PreparedStatement statement;
-			statement = con.prepareStatement("DELETE FROM character_quest_global_data WHERE charId = ? AND var = ?");
+			PreparedStatement statement = con.prepareStatement("DELETE FROM character_quest_global_data WHERE charId = ? AND var = ?");
 			statement.setInt(1, _player.getObjectId());
 			statement.setString(2, var);
 			statement.executeUpdate();

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

@@ -86,7 +86,8 @@ public final class RequestAnswerFriendInvite extends L2GameClientPacket
 				{
 					L2DatabaseFactory.close(con);
 				}
-			} else
+			}
+			else
 			{
 				SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.FAILED_TO_INVITE_A_FRIEND);
 				requestor.sendPacket(msg);

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

@@ -107,7 +107,6 @@ public final class RequestFriendDel extends L2GameClientPacket{
 		{
 			L2DatabaseFactory.close(con);
 		}
-		
 	}
 	
 	@Override

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

@@ -112,8 +112,7 @@ public final class InitWorldInfo extends BaseWritePacket
 					try
 					{
 						con = L2DatabaseFactory.getInstance().getConnection();
-						PreparedStatement statement;
-						statement = con.prepareStatement("SELECT friendId FROM character_friends WHERE charId=?");
+						PreparedStatement statement = con.prepareStatement("SELECT friendId FROM character_friends WHERE charId=?");
 						statement.setInt(1, p.getInteger("charId"));
 						ResultSet rset = statement.executeQuery();
 						

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

@@ -277,7 +277,7 @@ public class CharSelectionInfo extends L2GameServerPacket
 		}
 		finally
 		{
-			try { L2DatabaseFactory.close(con); } catch (Exception e) {}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -390,7 +390,10 @@ public class CharSelectionInfo extends L2GameServerPacket
 			{
 				_log.log(Level.WARNING, "Could not restore augmentation info: " + e.getMessage(), e);
 			}
-			finally { try { L2DatabaseFactory.close(con); } catch (Exception e) {} }
+			finally
+			{
+				L2DatabaseFactory.close(con);
+			}
 		}
 		
 		/*

L2J_Server_BETA/java/com/l2jserver/gameserver/taskmanager/tasks/TaskRecom.java

@@ -48,6 +48,7 @@ public class TaskRecom extends Task
 			statement.setInt(1, 0); // Rec left = 0
 			statement.setInt(2, 3600000); // Timer = 1 hour
 			statement.execute();
+			statement.close();
 			
 			statement = con.prepareStatement("UPDATE character_reco_bonus SET rec_left=?, time_left=?, rec_have=GREATEST(rec_have-20,0) WHERE rec_have > 20");
 			statement.setInt(1, 0); // Rec left = 0

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

@@ -234,7 +234,6 @@ public final class Evolve
 		{
 			L2DatabaseFactory.close(con);
 		}
-		
 		return true;
 	}
 	

L2J_Server_BETA/java/com/l2jserver/loginserver/GameServerTable.java

@@ -157,19 +157,14 @@ public class GameServerTable
 	
 	private void loadRegisteredGameServers() throws SQLException
 	{
-		Connection con = null;
-		PreparedStatement statement = null;
-		
-		int id;
-		con = L2DatabaseFactory.getInstance().getConnection();
-		statement = con.prepareStatement("SELECT * FROM gameservers");
+		Connection con = L2DatabaseFactory.getInstance().getConnection();
+		PreparedStatement statement = con.prepareStatement("SELECT * FROM gameservers");
 		ResultSet rset = statement.executeQuery();
-		GameServerInfo gsi;
+		int id;
 		while (rset.next())
 		{
 			id = rset.getInt("server_id");
-			gsi = new GameServerInfo(id, stringToHex(rset.getString("hexid")));
-			_gameServerTable.put(id, gsi);
+			_gameServerTable.put(id, new GameServerInfo(id, stringToHex(rset.getString("hexid"))));
 		}
 		rset.close();
 		statement.close();
@@ -232,11 +227,10 @@ public class GameServerTable
 	public void registerServerOnDB(byte[] hexId, int id, String externalHost)
 	{
 		Connection con = null;
-		PreparedStatement statement = null;
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
-			statement = con.prepareStatement("INSERT INTO gameservers (hexid,server_id,host) values (?,?,?)");
+			PreparedStatement statement = con.prepareStatement("INSERT INTO gameservers (hexid,server_id,host) values (?,?,?)");
 			statement.setString(1, hexToString(hexId));
 			statement.setInt(2, id);
 			statement.setString(3, externalHost);

L2J_Server_BETA/java/com/l2jserver/loginserver/LoginController.java

@@ -366,13 +366,12 @@ public class LoginController
 			if (loginOk && client.getLastServer() != serverId)
 			{
 				Connection con = null;
-				PreparedStatement statement = null;
 				try
 				{
 					con = L2DatabaseFactory.getInstance().getConnection();
 					
 					String stmt = "UPDATE accounts SET lastServer = ? WHERE login = ?";
-					statement = con.prepareStatement(stmt);
+					PreparedStatement statement = con.prepareStatement(stmt);
 					statement.setInt(1, serverId);
 					statement.setString(2, client.getAccount());
 					statement.executeUpdate();
@@ -395,13 +394,12 @@ public class LoginController
 	public void setAccountAccessLevel(String account, int banLevel)
 	{
 		Connection con = null;
-		PreparedStatement statement = null;
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
 			
 			String stmt = "UPDATE accounts SET accessLevel=? WHERE login=?";
-			statement = con.prepareStatement(stmt);
+			PreparedStatement statement = con.prepareStatement(stmt);
 			statement.setInt(1, banLevel);
 			statement.setString(2, account);
 			statement.executeUpdate();
@@ -413,13 +411,7 @@ public class LoginController
 		}
 		finally
 		{
-			try
-			{
-				L2DatabaseFactory.close(con);
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -427,13 +419,12 @@ public class LoginController
 			String hop1, String hop2, String hop3, String hop4)
 	{
 		Connection con = null;
-		PreparedStatement statement = null;
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
 			
 			String stmt = "UPDATE accounts SET pcIp=?, hop1=?, hop2=?, hop3=?, hop4=? WHERE login=?";
-			statement = con.prepareStatement(stmt);
+			PreparedStatement statement = con.prepareStatement(stmt);
 			statement.setString(1, pcIp);
 			statement.setString(2, hop1);
 			statement.setString(3, hop2);
@@ -449,13 +440,7 @@ public class LoginController
 		}
 		finally
 		{
-			try
-			{
-				L2DatabaseFactory.close(con);
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	

L2J_Server_BETA/java/com/l2jserver/loginserver/mail/BaseMail.java

@@ -142,13 +142,7 @@ public class BaseMail implements Runnable
 		}
 		finally
 		{
-			try
-			{
-				L2DatabaseFactory.close(con);
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 		return null;
 	}

L2J_Server_BETA/java/com/l2jserver/loginserver/network/gameserverpackets/ChangePassword.java

@@ -99,7 +99,6 @@ public class ChangePassword extends BaseRecievePacket
 					else
 					{
 						gst.ChangePasswordResponse((byte) 0, characterName, "The password change was unsuccessful!");
-						L2DatabaseFactory.close(con);
 					}
 				}
 				else

L2J_Server_BETA/java/com/l2jserver/util/lib/SqlUtils.java

@@ -64,7 +64,6 @@ public class SqlUtils
 		{
 			L2DatabaseFactory.close(con);
 		}
-		
 		return res;
 	}
 	
@@ -110,7 +109,6 @@ public class SqlUtils
 		{
 			L2DatabaseFactory.close(con);
 		}
-		
 		return res;
 	}