All pastes #45545 Raw Edit

Gnipi

public text v1 · immutable
#45545 ·published 2006-03-14 00:29 UTC
rendered paste body
Index: C:/workspace/c4/java/net/sf/l2j/status/LoginStatusThread.java
===================================================================
--- C:/workspace/c4/java/net/sf/l2j/status/LoginStatusThread.java	(revision 1592)
+++ C:/workspace/c4/java/net/sf/l2j/status/LoginStatusThread.java	(working copy)
@@ -13,15 +13,12 @@
 import java.net.Socket;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.Properties;
 import java.util.logging.Logger;
 
 import net.sf.l2j.Base64;
 import net.sf.l2j.Config;
-import net.sf.l2j.L2DatabaseFactory;
+import net.sf.l2j.sql.SQLHandler;
 import net.sf.l2j.loginserver.GameServerTable;
 import net.sf.l2j.loginserver.LoginController;
 import net.sf.l2j.loginserver.LoginServer;
@@ -202,31 +199,8 @@
 	{
 		if(!LoginController.getInstance().isGM(login))
 			return false;
-		java.sql.Connection con = null;
-		try
-		{
-			con = L2DatabaseFactory.getInstance().getConnection();
-			PreparedStatement statement = con.prepareStatement("SELECT password FROM accounts WHERE login=?");
-			statement.setString(1, login);
-			ResultSet rset = statement.executeQuery();
-			if (rset.next())
-			{
-				_pass = rset.getString("password");
-				statement.close();
-				con.close();
-				return true;
-			}
-			statement.close();
-		}
-		catch(SQLException sqle)
-		{
-			sqle.printStackTrace();
-		}
-		finally
-		{
-			try { con.close(); } catch (Exception e) {}
-		}
-		return false;
+		_pass=SQLHandler.getInstance().getStringValue("password","accounts","login",login);
+		return _pass=="" ? false : true;
 	}
 
 	public void run()
Index: C:/workspace/c4/java/net/sf/l2j/Config.java
===================================================================
--- C:/workspace/c4/java/net/sf/l2j/Config.java	(revision 1594)
+++ C:/workspace/c4/java/net/sf/l2j/Config.java	(working copy)
@@ -62,6 +62,7 @@
     public static String DATABASE_LOGIN;
     public static String DATABASE_PASSWORD;
     public static int DATABASE_MAX_CONNECTIONS;
+    public static int SQL_LOG_EXEC_TIME_MAX;       
     
     public static int   MAXIMUM_ONLINE_USERS;
     
@@ -652,6 +653,7 @@
 	            DATABASE_LOGIN              = serverSettings.getProperty("Login", "root");
 	            DATABASE_PASSWORD           = serverSettings.getProperty("Password", "");
 	            DATABASE_MAX_CONNECTIONS    = Integer.parseInt(serverSettings.getProperty("MaximumDbConnections", "10"));
+	            SQL_LOG_EXEC_TIME_MAX       = Integer.parseInt(serverSettings.getProperty("SqlLogExecTimeMax", "1000"));  	            
 	            
 	            COUNT_PACKETS          = Boolean.valueOf(serverSettings.getProperty("CountPacket", "false"));  
 	            DUMP_PACKET_COUNTS     = Boolean.valueOf(serverSettings.getProperty("DumpPacketCounts", "false"));
@@ -826,6 +828,7 @@
                 GM_NAME_COLOUR = Integer.decode("0x" + otherSettings.getProperty("GMNameColour", "00FF00"));
                 GM_STARTUP_INVISIBLE = Boolean.parseBoolean(otherSettings.getProperty("GMStartupInvisible", "True"));
                 GM_STARTUP_SILENCE = Boolean.parseBoolean(otherSettings.getProperty("GMStartupSilence", "True"));
+                
 	        }
 	        catch (Exception e)
 	        {
@@ -1048,6 +1051,7 @@
 	            DATABASE_LOGIN              = serverSettings.getProperty("Login", "root");
 	            DATABASE_PASSWORD           = serverSettings.getProperty("Password", "");
 	            DATABASE_MAX_CONNECTIONS    = Integer.parseInt(serverSettings.getProperty("MaximumDbConnections", "10"));
+	            SQL_LOG_EXEC_TIME_MAX       = Integer.parseInt(serverSettings.getProperty("SqlLogExecTimeMax","1000"));
 	            
 	            SHOW_LICENCE = Boolean.parseBoolean(serverSettings.getProperty("ShowLicence", "true"));
 	        }