same as previous commit, little cleanup

L2_GameServer/java/com/l2jserver/gameserver/ItemsAutoDestroy.java

@@ -27,7 +27,7 @@ import javolution.util.FastList;
 
 public class ItemsAutoDestroy
 {
-	protected static final Logger _log = Logger.getLogger("ItemsAutoDestroy");
+	protected static final Logger _log = Logger.getLogger(ItemsAutoDestroy.class.getName());
 	protected List<L2ItemInstance> _items = null;
 	protected static long _sleep;
 	

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

@@ -24,6 +24,9 @@ import java.util.Map;
 import java.util.concurrent.ScheduledFuture;
 import java.util.logging.Logger;
 
+import javolution.util.FastList;
+import javolution.util.FastMap;
+
 import com.l2jserver.Config;
 import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.gameserver.ai.CtrlIntention;
@@ -52,9 +55,6 @@ import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
 import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.Rnd;
 
-import javolution.util.FastList;
-import javolution.util.FastMap;
-
 /**
  *Seven Signs Festival of Darkness Engine
  *
@@ -995,7 +995,6 @@ public class SevenSignsFestival implements SpawnListener
 			
 			rset.close();
 			statement.close();
-			con.close();
 			
 			if (Config.DEBUG)
 				_log.info("SevenSignsFestival: Loaded data from database.");
@@ -1008,8 +1007,6 @@ public class SevenSignsFestival implements SpawnListener
 		{
 			try
 			{
-				rset.close();
-				statement.close();
 				con.close();
 			}
 			catch (SQLException e)

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

@@ -90,13 +90,6 @@ public class ArmorSetsTable
 		}
 		finally
 		{
-			try
-			{
-				statement.close();
-			}
-			catch (Exception e)
-			{
-			}
 			try
 			{
 				con.close();
@@ -139,13 +132,6 @@ public class ArmorSetsTable
 			}
 			finally
 			{
-				try
-				{
-					statement.close();
-				}
-				catch (Exception e)
-				{
-				}
 				try
 				{
 					con.close();

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

@@ -32,7 +32,7 @@ import javolution.util.FastList;
  */
 public class FishTable
 {
-	private static Logger _log = Logger.getLogger(SkillTreeTable.class.getName());
+	private static Logger _log = Logger.getLogger(FishTable.class.getName());
 	
 	private static List<FishData> _fishsNormal;
 	private static List<FishData> _fishsEasy;
@@ -56,21 +56,21 @@ public class FishTable
 			_fishsHard = new FastList<FishData>();
 			FishData fish;
 			PreparedStatement statement = con.prepareStatement("SELECT id, level, name, hp, hpregen, fish_type, fish_group, fish_guts, guts_check_time, wait_time, combat_time FROM fish ORDER BY id");
-			ResultSet Fishes = statement.executeQuery();
+			ResultSet fishes = statement.executeQuery();
 			
-			while (Fishes.next())
+			while (fishes.next())
 			{
-				int id = Fishes.getInt("id");
-				int lvl = Fishes.getInt("level");
-				String name = Fishes.getString("name");
-				int hp = Fishes.getInt("hp");
-				int hpreg = Fishes.getInt("hpregen");
-				int type = Fishes.getInt("fish_type");
-				int group = Fishes.getInt("fish_group");
-				int fish_guts = Fishes.getInt("fish_guts");
-				int guts_check_time = Fishes.getInt("guts_check_time");
-				int wait_time = Fishes.getInt("wait_time");
-				int combat_time = Fishes.getInt("combat_time");
+				int id = fishes.getInt("id");
+				int lvl = fishes.getInt("level");
+				String name = fishes.getString("name");
+				int hp = fishes.getInt("hp");
+				int hpreg = fishes.getInt("hpregen");
+				int type = fishes.getInt("fish_type");
+				int group = fishes.getInt("fish_group");
+				int fish_guts = fishes.getInt("fish_guts");
+				int guts_check_time = fishes.getInt("guts_check_time");
+				int wait_time = fishes.getInt("wait_time");
+				int combat_time = fishes.getInt("combat_time");
 				fish = new FishData(id, lvl, name, hp, hpreg, type, group, fish_guts, guts_check_time, wait_time, combat_time);
 				switch (fish.getGroup())
 				{
@@ -84,7 +84,7 @@ public class FishTable
 						_fishsHard.add(fish);
 				}
 			}
-			Fishes.close();
+			fishes.close();
 			statement.close();
 			count = _fishsEasy.size() + _fishsNormal.size() + _fishsHard.size();
 		}

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

@@ -65,13 +65,15 @@ public class PetSkillsTable
 				ResultSet petlist = statement.executeQuery();
 				Map<Integer, L2PetSkillLearn> map;
 				L2PetSkillLearn skillLearn;
+				
+				PreparedStatement statement2 = con.prepareStatement("SELECT minLvl, skillId, skillLvl FROM pets_skills where templateId=? ORDER BY skillId, skillLvl");
 				while (petlist.next())
 				{
 					map = new FastMap<Integer, L2PetSkillLearn>();
 					npcId = petlist.getInt("id");
-					PreparedStatement statement2 = con.prepareStatement("SELECT minLvl, skillId, skillLvl FROM pets_skills where templateId=? ORDER BY skillId, skillLvl");
 					statement2.setInt(1, npcId);
 					ResultSet skilltree = statement2.executeQuery();
+					statement2.clearParameters();
 					
 					while (skilltree.next())
 					{
@@ -84,11 +86,11 @@ public class PetSkillsTable
 					}
 					_skillTrees.put(npcId, map);
 					skilltree.close();
-					statement2.close();
 					
 					count += map.size();
 					_log.fine("PetSkillsTable: skill tree for pet " + npcId + " has " + map.size() + " skills");
 				}
+				statement2.close();
 				petlist.close();
 				statement.close();
 			}

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

@@ -20,7 +20,7 @@ import javolution.util.FastList;
  */
 public class ResidentialSkillTable
 {
-	private static Logger _log = Logger.getLogger(ArmorSetsTable.class.getName());
+	private static Logger _log = Logger.getLogger(ResidentialSkillTable.class.getName());
 
 	private static ResidentialSkillTable _instance = null;
 	private static TIntObjectHashMap<FastList<L2Skill>> _list;
@@ -63,8 +63,8 @@ public class ResidentialSkillTable
 				else
 					_list.get(entityId).add(sk);
 			}
-			statement.close();
 			rs.close();
+			statement.close();
 		}
 		catch (Exception e)
 		{

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

@@ -254,19 +254,13 @@ public abstract class IdFactory
 			stmt.executeUpdate("UPDATE fort SET owner=0 WHERE owner NOT IN (SELECT clan_id FROM clan_data);");
 			
 			_log.info("Cleaned " + cleanCount + " elements from database.");
+			stmt.close();
 		}
 		catch (SQLException e)
 		{
 		}
 		finally
 		{
-			try
-			{
-				stmt.close();
-			}
-			catch (Exception e)
-			{
-			}
 			try
 			{
 				con.close();
@@ -300,13 +294,6 @@ public abstract class IdFactory
 		}
 		finally
 		{
-			try
-			{
-				stmt.close();
-			}
-			catch (Exception e)
-			{
-			}
 			try
 			{
 				con.close();
@@ -333,71 +320,57 @@ public abstract class IdFactory
 			Statement statement = null;
 			ResultSet rset = null;
 			
-			try
+			statement = con.createStatement();
+			final TIntArrayList temp = new TIntArrayList();
+			
+			rset = statement.executeQuery("SELECT COUNT(*) FROM characters");
+			rset.next();
+			temp.ensureCapacity(rset.getInt(1));
+			rset = statement.executeQuery("SELECT charId FROM characters");
+			while (rset.next())
 			{
-				statement = con.createStatement();				
-				final TIntArrayList temp = new TIntArrayList();
-				
-				rset = statement.executeQuery("SELECT COUNT(*) FROM characters");
-				rset.next();
-				temp.ensureCapacity(rset.getInt(1));
-				rset = statement.executeQuery("SELECT charId FROM characters");
-				while (rset.next())
-				{
-					temp.add(rset.getInt(1));
-				}
-				
-				rset = statement.executeQuery("SELECT COUNT(*) FROM items");
-				rset.next();
-				temp.ensureCapacity(temp.size() + rset.getInt(1));
-				rset = statement.executeQuery("SELECT object_id FROM items");
-				while (rset.next())
-				{
-					temp.add(rset.getInt(1));
-				}
-				
-				rset = statement.executeQuery("SELECT COUNT(*) FROM clan_data");
-				rset.next();
-				temp.ensureCapacity(temp.size() + rset.getInt(1));
-				rset = statement.executeQuery("SELECT clan_id FROM clan_data");
-				while (rset.next())
-				{
-					temp.add(rset.getInt(1));
-				}
-				
-				rset = statement.executeQuery("SELECT COUNT(*) FROM itemsonground");
-				rset.next();
-				temp.ensureCapacity(temp.size() + rset.getInt(1));
-				rset = statement.executeQuery("SELECT object_id FROM itemsonground");
-				while (rset.next())
-				{
-					temp.add(rset.getInt(1));
-				}
-				
-				rset = statement.executeQuery("SELECT COUNT(*) FROM messages");
-				rset.next();
-				temp.ensureCapacity(temp.size() + rset.getInt(1));
-				rset = statement.executeQuery("SELECT messageId FROM messages");
-				while (rset.next())
-				{
-					temp.add(rset.getInt(1));
-				}
-
-				temp.sort();
-				
-				return temp.toNativeArray();
+				temp.add(rset.getInt(1));
 			}
-			finally
+			
+			rset = statement.executeQuery("SELECT COUNT(*) FROM items");
+			rset.next();
+			temp.ensureCapacity(temp.size() + rset.getInt(1));
+			rset = statement.executeQuery("SELECT object_id FROM items");
+			while (rset.next())
+			{
+				temp.add(rset.getInt(1));
+			}
+			
+			rset = statement.executeQuery("SELECT COUNT(*) FROM clan_data");
+			rset.next();
+			temp.ensureCapacity(temp.size() + rset.getInt(1));
+			rset = statement.executeQuery("SELECT clan_id FROM clan_data");
+			while (rset.next())
 			{
-				try
-				{
-					statement.close();
-				}
-				catch (Exception e)
-				{
-					
-				}
+				temp.add(rset.getInt(1));
 			}
+			
+			rset = statement.executeQuery("SELECT COUNT(*) FROM itemsonground");
+			rset.next();
+			temp.ensureCapacity(temp.size() + rset.getInt(1));
+			rset = statement.executeQuery("SELECT object_id FROM itemsonground");
+			while (rset.next())
+			{
+				temp.add(rset.getInt(1));
+			}
+			
+			rset = statement.executeQuery("SELECT COUNT(*) FROM messages");
+			rset.next();
+			temp.ensureCapacity(temp.size() + rset.getInt(1));
+			rset = statement.executeQuery("SELECT messageId FROM messages");
+			while (rset.next())
+			{
+				temp.add(rset.getInt(1));
+			}
+
+			temp.sort();
+			
+			return temp.toNativeArray();
 		}
 		finally
 		{

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

@@ -172,8 +172,7 @@ public class AuctionManager
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
-			PreparedStatement statement;
-			statement = con.prepareStatement("INSERT INTO `auction` VALUES " + ITEM_INIT_DATA[i]);
+			PreparedStatement statement = con.prepareStatement("INSERT INTO `auction` VALUES " + ITEM_INIT_DATA[i]);
 			statement.execute();
 			statement.close();
 			_auctions.add(new Auction(id));

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

@@ -111,7 +111,6 @@ public class DimensionalRiftManager
 			}
 			
 			s.close();
-			con.close();
 		}
 		catch (Exception e)
 		{
@@ -124,7 +123,7 @@ public class DimensionalRiftManager
 				con.close();
 			}
 			catch (Exception e)
-			{ /*do nothing */
+			{
 			}
 		}
 		

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

@@ -114,6 +114,7 @@ public class RaidBossSpawnManager
 			_log.info("RaidBossSpawnManager: Scheduled " + _schedules.size() + " Instances");
 
 			rset.close();
+			statement.close();
 		}
 		catch (SQLException e)
 		{
@@ -288,6 +289,7 @@ public class RaidBossSpawnManager
 				statement.setDouble(8, currentHP);
 				statement.setDouble(9, currentMP);
 				statement.execute();
+				statement.close();
 			}
 			catch (Exception e)
 			{
@@ -296,13 +298,6 @@ public class RaidBossSpawnManager
 			}
 			finally
 			{
-				try
-				{
-					statement.close();
-				}
-				catch (Exception e)
-				{
-				}
 				try
 				{
 					con.close();
@@ -350,6 +345,7 @@ public class RaidBossSpawnManager
 				statement = con.prepareStatement("DELETE FROM raidboss_spawnlist WHERE boss_id=?");
 				statement.setInt(1, bossId);
 				statement.execute();
+				statement.close();
 			}
 			catch (Exception e)
 			{
@@ -358,13 +354,6 @@ public class RaidBossSpawnManager
 			}
 			finally
 			{
-				try
-				{
-					statement.close();
-				}
-				catch (Exception e)
-				{
-				}
 				try
 				{
 					con.close();

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

@@ -614,6 +614,7 @@ public class TerritoryWarManager
 			statement.setInt(1, castleId);
 			statement.setInt(2, objId);
 			statement.execute();
+			statement.close();
 		}
 		catch (Exception e)
 		{
@@ -621,13 +622,6 @@ public class TerritoryWarManager
 		}
 		finally
 		{
-			try
-			{
-				statement.close();
-			}
-			catch (Exception e)
-			{
-			}
 			try
 			{
 				con.close();
@@ -652,6 +646,7 @@ public class TerritoryWarManager
 			statement.setString(1, wardList);
 			statement.setInt(2, ter.getTerritoryId());
 			statement.execute();
+			statement.close();
 		}
 		catch (Exception e)
 		{
@@ -659,13 +654,6 @@ public class TerritoryWarManager
 		}
 		finally
 		{
-			try
-			{
-				statement.close();
-			}
-			catch (Exception e)
-			{
-			}
 			try
 			{
 				con.close();