Author: solomax
Date: Wed Aug 8 03:21:43 2012
New Revision: 1370654
URL: http://svn.apache.org/viewvc?rev=1370654&view=rev
Log:
OPENMEETINGS-393 is fixed server is set only if it's ID was provided
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/ConferenceService.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/UserService.java
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/ConferenceService.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/ConferenceService.java?rev=1370654&r1=1370653&r2=1370654&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/ConferenceService.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/ConferenceService.java
Wed Aug 8 03:21:43 2012
@@ -593,8 +593,9 @@ public class ConferenceService {
argObjectMap.get("demoTime").toString()).intValue();
}
+ long roomId = -1;
if (rooms_id == 0) {
- return roommanagement.addRoom(
+ roomId = roommanagement.addRoom(
User_level,
argObjectMap.get("name").toString(),
Long.valueOf(
@@ -635,10 +636,10 @@ public class ConferenceService {
Boolean.valueOf(argObjectMap.get("hideScreenSharing").toString()),
Boolean.valueOf(argObjectMap.get("hideWhiteboard").toString()),
Boolean.valueOf(argObjectMap.get("showMicrophoneStatus").toString()),
-
serverDao.getServer(Long.parseLong(argObjectMap.get("serverId").toString()))
+ null
);
} else if (rooms_id > 0) {
- long roomId = roommanagement.updateRoom(
+ roomId = roommanagement.updateRoom(
User_level,
rooms_id,
Long.valueOf(
@@ -686,15 +687,23 @@ public class ConferenceService {
Boolean.valueOf(argObjectMap.get("hideWhiteboard").toString()),
Boolean.valueOf(argObjectMap.get("showMicrophoneStatus").toString())
);
+ }
+ long serverId = -1;
+ try {
+ serverId =
Long.parseLong(argObjectMap.get("serverId").toString());
+ } catch (NumberFormatException nfe) {
+ //noop expected;
+ }
+ if (roomId > -1 && serverId > -1) {
try {
Rooms room =
roommanagement.getRoomById(roomId);
-
room.setServer(serverDao.getServer(Long.parseLong(argObjectMap.get("serverId").toString())));
+
room.setServer(serverDao.getServer(serverId));
roommanagement.updateRoomObject(room);
} catch (Exception e) {
log.error("Error while setting
server.");
}
- return roomId;
}
+ return roomId;
} catch (Exception e) {
log.error("saveOrUpdateRoom", e);
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/UserService.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/UserService.java?rev=1370654&r1=1370653&r2=1370654&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/UserService.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/UserService.java
Wed Aug 8 03:21:43 2012
@@ -375,8 +375,9 @@ public class UserService {
log.debug("Mail : " +
argObjectMap.get("email").toString());
log.debug("Phone : " +
argObjectMap.get("phone").toString());
+ long userId;
if (user_idClient == null || user_idClient == 0) {
- return userManagement.registerUserInit(
+ userId = userManagement.registerUserInit(
user_level,
Long.valueOf(argObjectMap.get("level_id").toString())
.longValue(),
@@ -425,9 +426,9 @@ public class UserService {
Boolean.valueOf(
argObjectMap.get("showContactDataToContacts")
.toString()).booleanValue(),
-
serverDao.getServer(Long.parseLong(argObjectMap.get("serverId").toString())));
+ null);
} else {
- long userId = userManagement.updateUser(
+ userId = userManagement.updateUser(
user_level,
user_idClient,
Long.valueOf(
@@ -484,17 +485,23 @@ public class UserService {
argObjectMap.get(
"showContactDataToContacts")
.toString()).booleanValue());
- if (userId > 0) {
- try {
- Users user =
userManagement.getUserById(userId);
-
user.setServer(serverDao.getServer(Long.parseLong(argObjectMap.get("serverId").toString())));
- userManagement.updateUser(user);
- } catch (Exception e) {
- log.error("Error while setting
server.");
- }
+ }
+ long serverId = -1;
+ try {
+ serverId =
Long.parseLong(argObjectMap.get("serverId").toString());
+ } catch (NumberFormatException nfe) {
+ //noop expected;
+ }
+ if (userId > -1 && serverId > -1) {
+ try {
+ Users user =
userManagement.getUserById(userId);
+
user.setServer(serverDao.getServer(serverId));
+ userManagement.updateUser(user);
+ } catch (Exception e) {
+ log.error("Error while setting
server.");
}
- return userId;
}
+ return userId;
} catch (Exception ex) {
log.error("[saveOrUpdateUser]: ", ex);
}
