Przeglądaj źródła

BETA: Minor fix for GlobalVariablesManager.
* Reported by: lucan
* Tested by: lucan

xban1x 11 lat temu
rodzic
commit
bdf2f43602

+ 9 - 14
L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/GlobalVariablesManager.java

@@ -40,7 +40,7 @@ public final class GlobalVariablesManager extends AbstractVariables
 	// SQL Queries.
 	private static final String SELECT_QUERY = "SELECT * FROM global_variables";
 	private static final String DELETE_QUERY = "DELETE FROM global_variables";
-	private static final String INSERT_QUERY = "INSERT INTO global_variables (var, val) VALUES (?, ?)";
+	private static final String INSERT_QUERY = "INSERT INTO global_variables (var, value) VALUES (?, ?)";
 	
 	protected GlobalVariablesManager()
 	{
@@ -82,25 +82,20 @@ public final class GlobalVariablesManager extends AbstractVariables
 			return;
 		}
 		
-		try (Connection con = L2DatabaseFactory.getInstance().getConnection())
+		try (Connection con = L2DatabaseFactory.getInstance().getConnection();
+			PreparedStatement st = con.prepareStatement(INSERT_QUERY))
 		{
 			// Clear previous entries.
-			try (PreparedStatement st = con.prepareStatement(DELETE_QUERY))
-			{
-				st.execute();
-			}
+			con.prepareStatement(DELETE_QUERY).execute();
 			
 			// Insert all variables.
-			try (PreparedStatement st = con.prepareStatement(INSERT_QUERY))
+			for (Entry<String, Object> entry : getSet().entrySet())
 			{
-				for (Entry<String, Object> entry : getSet().entrySet())
-				{
-					st.setString(1, entry.getKey());
-					st.setString(2, String.valueOf(entry.getValue()));
-					st.addBatch();
-				}
-				st.executeBatch();
+				st.setString(1, entry.getKey());
+				st.setString(2, String.valueOf(entry.getValue()));
+				st.addBatch();
 			}
+			st.executeBatch();
 		}
 		catch (SQLException e)
 		{