From: Florian L. <fle...@us...> - 2005-11-14 14:11:39
|
Update of /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/facade In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2004/src/net/sf/magicmap/server/facade Modified Files: PositionFacade2.java Log Message: ohne rollbacks Index: PositionFacade2.java =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/facade/PositionFacade2.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** PositionFacade2.java 8 Nov 2005 13:14:50 -0000 1.8 --- PositionFacade2.java 14 Nov 2005 14:11:29 -0000 1.9 *************** *** 123,127 **** return result; } catch (Exception e){ ! pm.currentTransaction().rollback(); throw new MapException("", e); } --- 123,127 ---- return result; } catch (Exception e){ ! // pm.currentTransaction().rollback(); throw new MapException("", e); } *************** *** 142,146 **** if (positionX < 0 || positionY < 0 || positionX > (result.getImageWidth().intValue() - 1) || positionY > (result.getImageHeight().intValue() - 1)){ ! pm.currentTransaction().rollback(); throw new MapException("Position ist nicht auf der Karte"); } --- 142,146 ---- if (positionX < 0 || positionY < 0 || positionX > (result.getImageWidth().intValue() - 1) || positionY > (result.getImageHeight().intValue() - 1)){ ! // pm.currentTransaction().rollback(); throw new MapException("Position ist nicht auf der Karte"); } *************** *** 186,190 **** result = (Session) results.iterator().next(); } else{ ! pm.currentTransaction().rollback(); throw new SessionException("Session mit der id:" + sessionId + " existiert nicht"); } --- 186,190 ---- result = (Session) results.iterator().next(); } else{ ! // pm.currentTransaction().rollback(); throw new SessionException("Session mit der id:" + sessionId + " existiert nicht"); } *************** *** 200,204 **** private Client checkClient(String mac, PersistenceManager pm) throws MapException{ if (mac == null || "".equals(mac)){ ! pm.currentTransaction().rollback(); throw new MapException("Client mac darf nicht leer sein"); } --- 200,204 ---- private Client checkClient(String mac, PersistenceManager pm) throws MapException{ if (mac == null || "".equals(mac)){ ! // pm.currentTransaction().rollback(); throw new MapException("Client mac darf nicht leer sein"); } *************** *** 212,216 **** result = (Client) results.iterator().next(); } else{ ! pm.currentTransaction().rollback(); throw new MapException("Client mit der mac-adresse:" + mac + " existiert nicht"); } --- 212,216 ---- result = (Client) results.iterator().next(); } else{ ! // pm.currentTransaction().rollback(); throw new MapException("Client mit der mac-adresse:" + mac + " existiert nicht"); } |