[Arianne-commits] stendhal/src/games/stendhal/server/core/engine StendhalPlayerDatabase.java, 1.2, 1.3

[Astrid S. <ast...@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/core/engine
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv25382/src/games/stendhal/server/core/engine

Modified Files:
	StendhalPlayerDatabase.java 
Log Message:
use IDatabase from parent
widen visibility of constructor for the sake of testing

Index: StendhalPlayerDatabase.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/core/engine/StendhalPlayerDatabase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** StendhalPlayerDatabase.java	3 Jan 2008 13:21:57 -0000	1.2
--- StendhalPlayerDatabase.java	3 Jan 2008 17:59:25 -0000	1.3
***************
*** 20,24 ****
  import marauroa.server.game.db.JDBCDatabase;
  import marauroa.server.game.db.JDBCSQLHelper;
- import marauroa.server.game.db.JDBCTransaction;
  import marauroa.server.game.db.NoDatabaseConfException;
  import marauroa.server.game.db.StringChecker;
--- 20,23 ----
***************
*** 31,36 ****
  
  	
  	
! 	private StendhalPlayerDatabase(Properties connInfo) {
  		super(connInfo);
  		try {
--- 30,53 ----
  
  	
+ 	/**
+ 	 * This method returns an instance of PlayerDatabase.
+ 	 * 
+ 	 * @return A shared instance of PlayerDatabase
+ 	 */
+ 	public static IDatabase getDatabase() {
+ 		try {
+ 			if (database == null) {
+ 				logger.info("Starting Stendhal JDBC Database");
+ 				database =  (JDBCDatabase) newConnection();
+ 			}
+ 
+ 			return database;
+ 		} catch (Exception e) {
+ 			logger.error("cannot get database connection", e);
+ 			throw new NoDatabaseConfException(e);
+ 		}
+ 	}
  	
! 	protected StendhalPlayerDatabase(Properties connInfo) {
  		super(connInfo);
  		try {
***************
*** 41,45 ****
  	}
  
! 	private void configureDatabase() throws SQLException {
  		Transaction trans = getTransaction();
  		JDBCSQLHelper.get().runDBScript(trans,
--- 58,62 ----
  	}
  
! 	protected void configureDatabase() throws SQLException {
  		Transaction trans = getTransaction();
  		JDBCSQLHelper.get().runDBScript(trans,
***************
*** 324,347 ****
  	}
  
- 	protected static IDatabase playerDatabase;
- 
- 	/**
- 	 * This method returns an instance of PlayerDatabase.
- 	 * 
- 	 * @return A shared instance of PlayerDatabase
- 	 */
- 	public static IDatabase getDatabase() {
- 		try {
- 			if (playerDatabase == null) {
- 				logger.info("Starting Stendhal JDBC Database");
- 				playerDatabase =  newConnection();
- 			}
  
- 			return playerDatabase;
- 		} catch (Exception e) {
- 			logger.error("cannot get database connection", e);
- 			throw new NoDatabaseConfException(e);
- 		}
- 	}
  
  	/**
--- 341,345 ----
***************
*** 351,360 ****
  	public static void closeDatabase() {
  		try {
! 			if (playerDatabase != null) {
  				logger.info("closing Stendhal JDBC Database");
! 				playerDatabase.close();
  			}
  
! 			playerDatabase = null;
  		} catch (Exception e) {
  			logger.error("cannot close database connection", e);
--- 349,358 ----
  	public static void closeDatabase() {
  		try {
! 			if (database != null) {
  				logger.info("closing Stendhal JDBC Database");
! 				database.close();
  			}
  
! 			database = null;
  		} catch (Exception e) {
  			logger.error("cannot close database connection", e);