Update of /cvsroot/magicmap//magicmapserver/src/net/sf/magicmap/server/facade
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9906/src/net/sf/magicmap/server/facade
Modified Files:
SessionFacade.java MapFacade.java PositionFacade2.java
PositionFacade.java
Log Message:
kleinere wichtige Bugfixes
Index: MapFacade.java
===================================================================
RCS file: /cvsroot/magicmap//magicmapserver/src/net/sf/magicmap/server/facade/MapFacade.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** MapFacade.java 23 Feb 2006 22:53:37 -0000 1.14
--- MapFacade.java 6 Mar 2006 10:59:03 -0000 1.15
***************
*** 304,307 ****
--- 304,311 ----
JDOUtil.closePM(pm);
}
+ if (result == null)
+ {
+ result = new GeoPointDTO[0];
+ }
return result;
}
Index: SessionFacade.java
===================================================================
RCS file: /cvsroot/magicmap//magicmapserver/src/net/sf/magicmap/server/facade/SessionFacade.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SessionFacade.java 11 May 2005 10:45:05 -0000 1.5
--- SessionFacade.java 6 Mar 2006 10:59:03 -0000 1.6
***************
*** 41,45 ****
// check Version
if (!Version.PROTOCOL_VERSION.equals(version)){
! throw new AuthenticationException("Client-Server-Versionen passen nicht: " + Version.PROTOCOL_VERSION + " <> "
+ version);
}
--- 41,45 ----
// check Version
if (!Version.PROTOCOL_VERSION.equals(version)){
! throw new AuthenticationException("Client-Server-Versionen passen nicht: (Serverprotokollversion) " + Version.PROTOCOL_VERSION + " <> (Clientprotokollversion) "
+ version);
}
***************
*** 87,91 ****
JDOUtil.commit(tx);
} catch (Exception e){
! this.logger.fatal("fehler", e);
JDOUtil.rollBack(tx);
throw new AuthenticationException(e.getMessage(), e);
--- 87,91 ----
JDOUtil.commit(tx);
} catch (Exception e){
! this.logger.fatal("Fehler", e);
JDOUtil.rollBack(tx);
throw new AuthenticationException(e.getMessage(), e);
Index: PositionFacade2.java
===================================================================
RCS file: /cvsroot/magicmap//magicmapserver/src/net/sf/magicmap/server/facade/PositionFacade2.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** PositionFacade2.java 23 Feb 2006 21:40:34 -0000 1.12
--- PositionFacade2.java 6 Mar 2006 10:59:03 -0000 1.13
***************
*** 90,94 ****
pos.setPosX(positionX);
pos.setPosY(positionY);
! PositionCache.getPositionCache().createOrUpdatePosition(map,pos);
}
--- 90,94 ----
pos.setPosX(positionX);
pos.setPosY(positionY);
! PositionCache.getPositionCache().createOrUpdatePosition(map,pos,client.getMac());
}
***************
*** 468,471 ****
--- 468,472 ----
pos.getAccessPoint().setHidden(hidden);
PositionCache.getPositionCache().createOrUpdatePosition(map,pos);
+ pm.currentTransaction().commit();
} catch (Exception e){
e.printStackTrace();
Index: PositionFacade.java
===================================================================
RCS file: /cvsroot/magicmap//magicmapserver/src/net/sf/magicmap/server/facade/PositionFacade.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** PositionFacade.java 23 Feb 2006 22:18:27 -0000 1.13
--- PositionFacade.java 6 Mar 2006 10:59:03 -0000 1.14
***************
*** 708,712 ****
}
this.logger.info("getPositionsForMapSince() - done ");
! return (PositionDTO[]) result.toArray(new PositionDTO[0]);
}
--- 708,715 ----
}
this.logger.info("getPositionsForMapSince() - done ");
! PositionDTO[] positions = (PositionDTO[])result.toArray(new PositionDTO[0]);
! if (positions == null)
! positions = new PositionDTO[0];
! return positions;
}
|
