[Arianne-commits] marauroa/src/marauroa/server/game/db RPObjectDAO.java, 1.9, 1.10

[Hendrik <nh...@us...>]

Update of /cvsroot/arianne/marauroa/src/marauroa/server/game/db
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv24353/src/marauroa/server/game/db

Modified Files:
	RPObjectDAO.java 
Log Message:
added new signature for loadRPObject which does not transform it

Index: RPObjectDAO.java
===================================================================
RCS file: /cvsroot/arianne/marauroa/src/marauroa/server/game/db/RPObjectDAO.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** RPObjectDAO.java	18 Jul 2009 15:30:01 -0000	1.9
--- RPObjectDAO.java	2 Sep 2009 21:47:13 -0000	1.10
***************
*** 54,59 ****
  		this.factory = factory;
  	}
! 	
  	public RPObject loadRPObject(DBTransaction transaction, int objectid) throws SQLException, IOException {
  		String query = "select data from rpobject where object_id=[objectid]";
  		logger.debug("loadRPObject is executing query " + query);
--- 54,63 ----
  		this.factory = factory;
  	}
! 
  	public RPObject loadRPObject(DBTransaction transaction, int objectid) throws SQLException, IOException {
+ 		return loadRPObject(transaction, objectid, true);
+ 	}
+ 
+ 	public RPObject loadRPObject(DBTransaction transaction, int objectid, boolean transform) throws SQLException, IOException {
  		String query = "select data from rpobject where object_id=[objectid]";
  		logger.debug("loadRPObject is executing query " + query);
***************
*** 83,89 ****
  			InputSerializer inser = new InputSerializer(szlib);
  
! 			RPObject object = null;
  
- 			object = factory.transform((RPObject) inser.readObject(new RPObject()));
  			object.put("#db_id", objectid);
  
--- 87,96 ----
  			InputSerializer inser = new InputSerializer(szlib);
  
! 			RPObject object = (RPObject) inser.readObject(new RPObject());
! 
! 			if (transform) {
! 				object = factory.transform(object);
! 			}
  
  			object.put("#db_id", objectid);
  
***************
*** 165,171 ****
  	}
  
  	public RPObject loadRPObject(int objectid) throws SQLException, IOException {
  		DBTransaction transaction = TransactionPool.get().beginWork();
! 		RPObject res = loadRPObject(transaction, objectid);
  		TransactionPool.get().commit(transaction);
  		return res;
--- 172,185 ----
  	}
  
+ 	public RPObject loadRPObject(int objectid, boolean transform) throws SQLException, IOException {
+ 		DBTransaction transaction = TransactionPool.get().beginWork();
+ 		RPObject res = loadRPObject(transaction, objectid, transform);
+ 		TransactionPool.get().commit(transaction);
+ 		return res;
+ 	}
+ 
  	public RPObject loadRPObject(int objectid) throws SQLException, IOException {
  		DBTransaction transaction = TransactionPool.get().beginWork();
! 		RPObject res = loadRPObject(transaction, objectid, true);
  		TransactionPool.get().commit(transaction);
  		return res;