Merge pull request kbengine#151 from linjx/master

kbengine · kbengine · commit 58ad0f53b390 · 2014-10-30T08:56:13.000+08:00
dbinterface == NULL 判断提前
diff --git a/kbe/src/lib/dbmgr_lib/db_interface.cpp b/kbe/src/lib/dbmgr_lib/db_interface.cpp
@@ -83,7 +83,7 @@ bool DBUtil::initialize()
 
 	if(dbcfg.db_passwordEncrypt)
 	{
-		// ���С��64���ʾĿǰ������������
+		// 如果小于64则表示目前还是明文密码
 		if(strlen(dbcfg.db_password) < 64)
 		{
 			WARNING_MSG(fmt::format("DBUtil::createInterface: db password is not encrypted!\nplease use password(rsa):\n{}\n",
@@ -121,19 +121,19 @@ DBInterface* DBUtil::createInterface(bool showinfo)
 		dbinterface = new DBInterfaceMysql(dbcfg.db_unicodeString_characterSet, dbcfg.db_unicodeString_collation);
 	}
 
+	if(dbinterface == NULL)
+	{
+		ERROR_MSG("DBUtil::createInterface: can't create dbinterface!\n");
+		return NULL;
+	}
+	
 	kbe_snprintf(dbinterface->db_type_, MAX_BUF, "%s", dbcfg.db_type);
 	dbinterface->db_port_ = dbcfg.db_port;	
 	kbe_snprintf(dbinterface->db_ip_, MAX_IP, "%s", dbcfg.db_ip);
 	kbe_snprintf(dbinterface->db_username_, MAX_BUF, "%s", dbcfg.db_username);
 	dbinterface->db_numConnections_ = dbcfg.db_numConnections;
 	kbe_snprintf(dbinterface->db_password_, MAX_BUF, "%s", dbcfg.db_password);
 
-	if(dbinterface == NULL)
-	{
-		ERROR_MSG("DBUtil::createInterface: can't create dbinterface!\n");
-		return NULL;
-	}
-
 	if(!dbinterface->attach(DBUtil::dbname()))
 	{
 		ERROR_MSG(fmt::format("DBUtil::createInterface: can't attach to database!\n\tdbinterface={0:p}\n\targs={1}",
