Revision: 4168
Author: seba.wagner
Date: Sun Sep 4 01:44:00 2011
Log: Fix some Exception from Testing Results
http://code.google.com/p/openmeetings/source/detail?r=4168
Modified:
/trunk/singlewebapp/WebContent/openmeetings/plugins/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Usermanagement.java
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConferenceService.java
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/plugins/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
Mon Jul 4 08:55:10 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/plugins/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
Sun Sep 4 01:44:00 2011
@@ -430,8 +430,8 @@
var tArray = new Array();
tArray[0] = "moveMap";
- tArray[1] = this.x;
- tArray[2] = this.y;
+ tArray[1] = Math.round(this.x);
+ tArray[2] = Math.round(this.y);
this.parent.parent._drawareaMask._drawarea.onsharedMessage('moveMap',tArray);
this.timeisInited=false;
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Usermanagement.java
Tue Aug 30 13:17:16 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Usermanagement.java
Sun Sep 4 01:44:00 2011
@@ -1260,6 +1260,7 @@
users.setDeleted("false");
em.merge(users);
+ em.flush();
long user_id = users.getUser_id();
return user_id;
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConferenceService.java
Tue Aug 30 13:17:16 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConferenceService.java
Sun Sep 4 01:44:00 2011
@@ -134,6 +134,10 @@
.getRoomsOrganisationByOrganisationId(user_level,
organisation_id);
+ if (roomOrgsList == null) {
+ return null;
+ }
+
List<Rooms_Organisation> filtered = new
ArrayList<Rooms_Organisation>();
for (Iterator<Rooms_Organisation> iter =
roomOrgsList.iterator(); iter
@@ -216,15 +220,18 @@
public List<Rooms> getRoomsPublicWithoutType(String SID) {
try {
- log.debug("getRoomsPublic");
Long users_id = sessionManagement.checkSession(SID);
Long user_level =
userManagement.getUserLevelByID(users_id);
- log.error("getRoomsPublic user_level: " + user_level);
+ log.debug("getRoomsPublic user_level: " + user_level);
List<Rooms> roomList = roommanagement
.getPublicRoomsWithoutType(user_level);
+ if (roomList == null) {
+ return null;
+ }
+
// Filter : no appointed meetings
List<Rooms> filtered = new ArrayList<Rooms>();
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
