magicmap-commits

[Florian L. <fle...@us...>]

Update of /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/facade
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29526/src/net/sf/magicmap/server/facade

Modified Files:
	PositionFacade2.java 
Log Message:
Implementation des Positioning-Caches

Index: PositionFacade2.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/facade/PositionFacade2.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** PositionFacade2.java	14 Nov 2005 14:11:29 -0000	1.9
--- PositionFacade2.java	15 Nov 2005 12:50:56 -0000	1.10
***************
*** 46,50 ****
--- 46,54 ----
  	    try{
  	    	pm = JDOUtil.pmfactory.getPersistenceManager();
+ 	    	pm.currentTransaction().begin();
  	    	createOrUpdatePositionInternal(sessionId, mapName, positionX, positionY, character, positionName, fixed, pm);	  
+ 	    	if (pm.currentTransaction().isActive()){
+ 	    		pm.currentTransaction().commit();
+ 	    	}
  	    } catch (Exception e){
  	      e.printStackTrace();
***************
*** 227,232 ****
  	    PersistenceManager pm = null;
  	    try{
! 	      pm = JDOUtil.pmfactory.getPersistenceManager();	      
  	      createOrUpdateClientPositionInternal(sessionId, mapName, positionX, positionY, character, clientMac, fixed, pm);
  	    } catch (Exception e){
  	      e.printStackTrace();
--- 231,240 ----
  	    PersistenceManager pm = null;
  	    try{
! 	      pm = JDOUtil.pmfactory.getPersistenceManager();	
! 	      pm.currentTransaction().begin();
  	      createOrUpdateClientPositionInternal(sessionId, mapName, positionX, positionY, character, clientMac, fixed, pm);
+ 		  if (pm.currentTransaction().isActive()){
+ 	    		pm.currentTransaction().commit();
+ 		  }
  	    } catch (Exception e){
  	      e.printStackTrace();
***************
*** 286,289 ****
--- 294,298 ----
  	    try{
  	      pm = JDOUtil.pmfactory.getPersistenceManager();
+ 	      pm.currentTransaction().begin();
  	      checkSession(sessionId, pm);
  	      Map map = checkMap(mapName, positionX, positionY, pm);
***************
*** 303,307 ****
  		    pos.setPosY(positionY);
  		    PositionCache.getPositionCache().createOrUpdatePosition(map,pos);
! 	    
  	    } catch (Exception e){
  	      e.printStackTrace();
--- 312,318 ----
  		    pos.setPosY(positionY);
  		    PositionCache.getPositionCache().createOrUpdatePosition(map,pos);
! 		    if (pm.currentTransaction().isActive()){
! 	    		pm.currentTransaction().commit();
! 		    }	    
  	    } catch (Exception e){
  	      e.printStackTrace();
***************
*** 328,334 ****
--- 339,349 ----
  	    try{
  	      pm = JDOUtil.pmfactory.getPersistenceManager();
+ 	      pm.currentTransaction().begin();
  	      checkSession(sessionId, pm);
  	      Map map = checkMap(mapname, newPositionX, newPositionY, pm);
  	      PositionCache.getPositionCache().movePosition(map, positionId, newPositionX, newPositionY, fixed);
+ 	      if (pm.currentTransaction().isActive()){
+ 	    		pm.currentTransaction().commit();
+ 		    }	    
  	    }
  	    catch (Exception e){
***************
*** 355,361 ****
--- 370,380 ----
  	    try{
  	      pm = JDOUtil.pmfactory.getPersistenceManager();
+ 	      pm.currentTransaction().begin();
  	      checkSession(sessionId, pm);
  	      Map map = checkMap(mapname, pm);
  	      PositionCache.getPositionCache().deletePosition(map,positionId);
+ 	      if (pm.currentTransaction().isActive()){
+ 	    		pm.currentTransaction().commit();
+ 		    }	    
  	    } catch (Exception e){
  	      e.printStackTrace();
***************
*** 384,390 ****
--- 403,413 ----
  	    try{
  	      pm = JDOUtil.pmfactory.getPersistenceManager();
+ 	      pm.currentTransaction().begin();
  	      checkSession(sessionId, pm);
  	      Map map = checkMap(mapName, pm);
  	      result = PositionCache.getPositionCache().getPositionsForMapSince(map,timeStamp);
+ 	      if (pm.currentTransaction().isActive()){
+ 	    		pm.currentTransaction().commit();
+ 		    }	    
  	    } catch (Exception e){
  	      e.printStackTrace();
***************
*** 413,416 ****
--- 436,440 ----
  		    try{
  		      pm = JDOUtil.pmfactory.getPersistenceManager();
+ 		      pm.currentTransaction().begin();
  		      checkSession(sessionId, pm);
  		      Map map = checkMap(mapName, pm);
***************
*** 418,421 ****
--- 442,448 ----
  		      PositionDTO pos = PositionCache.getPositionCache().getPositionForClientOnMap(map,clientMac);
  		      positionResult = String.valueOf(pos.getPosX())+ "#" + String.valueOf(pos.getPosY()) + "#" + String.valueOf(pos.isFixed());
+ 		      if (pm.currentTransaction().isActive()){
+ 		    		pm.currentTransaction().commit();
+ 			    }	    
  		    } catch (Exception e){
  		      e.printStackTrace();