Author: solomax
Date: Fri Nov 28 20:30:21 2014
New Revision: 1642359
URL: http://svn.apache.org/r1642359
Log:
[OPENMEETINGS-954] NPE in MobileService is fixed; additional fields are added;
code clean-up
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/room/Client.java
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MainService.java
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MobileService.java
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/room/Client.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/room/Client.java?rev=1642359&r1=1642358&r2=1642359&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/room/Client.java
(original)
+++
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/room/Client.java
Fri Nov 28 20:30:21 2014
@@ -158,9 +158,9 @@ public class Client implements IDataProv
* @see Client#getCanGiveAudio()
*/
@Column(name = "can_giveaudio")
- private Boolean canGiveAudio = false;
+ private Boolean canGiveAudio = false;
- /**
+ /**
* @see Client#getConnectedSince()
*/
@Column(name = "connected_since")
@@ -247,8 +247,8 @@ public class Client implements IDataProv
/**
* @see Client#getMail()
*/
- @Column(name = "mail")
- private String mail;
+ @Column(name = "email")
+ private String email;
/**
* @see Client#getLastLogin()
@@ -357,21 +357,21 @@ public class Client implements IDataProv
* @see Client#getExternalUserType()
*/
@Column(name = "external_user_type")
- private String externalUserType;
+ private String externalUserType;
- /**
+ /**
* @see Client#getInterviewPodId()
*/
@Column(name = "interview_pod_id")
- private Integer interviewPodId = null;
+ private Integer interviewPodId = null;
- /**
+ /**
* @see Client#getAllowRecording()
*/
@Column(name = "allow_recording")
- private boolean allowRecording = true;
+ private boolean allowRecording = true;
- /**
+ /**
* @see Client#getZombieCheckFlag()
*/
@Column(name = "zombie_check_flag")
@@ -381,21 +381,19 @@ public class Client implements IDataProv
* @see Client#getMicMuted()
*/
@Column(name = "mic_muted")
- private Boolean micMuted = false;
+ private Boolean micMuted = false;
- /**
+ /**
* @see Client#isSipTransport()
*/
@Column(name = "sip_transport")
- private boolean sipTransport = false;
+ private boolean sipTransport = false;
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "server_id")
private Server server;
- public Client() {
-
- }
+ public Client() {}
public Client(String streamid, String publicSID, Long room_id,
Long user_id, String firstname, String lastname,
boolean isAVClient,
@@ -554,12 +552,12 @@ public class Client implements IDataProv
this.lastname = lastname;
}
- public String getMail() {
- return mail;
+ public String getEmail() {
+ return email;
}
- public void setMail(String mail) {
- this.mail = mail;
+ public void setEmail(String email) {
+ this.email = email;
}
public String getOfficial_code() {
@@ -818,7 +816,7 @@ public class Client implements IDataProv
this.canRemote = canRemote;
}
- public Boolean getCanGiveAudio() {
+ public Boolean getCanGiveAudio() {
return canGiveAudio;
}
Modified:
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MainService.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MainService.java?rev=1642359&r1=1642358&r2=1642359&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MainService.java
(original)
+++
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MainService.java
Fri Nov 28 20:30:21 2014
@@ -350,7 +350,7 @@ public class MainService implements IPen
currentClient.setFirstname(firstname);
currentClient.setLastname(lastname);
- currentClient.setMail(email);
+ currentClient.setEmail(email);
// Log the User
conferenceLogDao.addConferenceLog(
@@ -358,7 +358,7 @@ public class MainService implements IPen
null, currentClient.getUserip(),
currentClient.getScope(),
currentClient.getExternalUserId(),
currentClient.getExternalUserType(),
- currentClient.getMail(),
currentClient.getFirstname(),
+ currentClient.getEmail(),
currentClient.getFirstname(),
currentClient.getLastname());
this.sessionManager.updateClientByStreamId(streamId,
@@ -435,7 +435,7 @@ public class MainService implements IPen
currentClient.setUserObject(userObject.getUsername(),
userObject.getFirstname(), userObject.getLastname());
currentClient.setPicture_uri(userObject.getPictureUrl());
-
currentClient.setMail(userObject.getEmail());
+
currentClient.setEmail(userObject.getEmail());
log.debug("UPDATE USER BY STREAMID " +
streamId);
Modified:
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MobileService.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MobileService.java?rev=1642359&r1=1642358&r2=1642359&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MobileService.java
(original)
+++
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MobileService.java
Fri Nov 28 20:30:21 2014
@@ -108,7 +108,7 @@ public class MobileService implements IP
result.put("firstname",
u.getFirstname());
result.put("lastname", u.getLastname());
result.put("login", u.getLogin());
- result.put("mail", u.getAdresses() ==
null ? "" : u.getAdresses().getEmail()); //FIXME should be renamed
+ result.put("email", u.getAdresses() ==
null ? "" : u.getAdresses().getEmail());
result.put("language",
u.getLanguage_id()); //TODO rights
}
}
@@ -134,7 +134,9 @@ public class MobileService implements IP
map.put("firstname",
c.getFirstname());
map.put("lastname",
c.getLastname());
map.put("publicSid",
c.getPublicSID());
- map.put("mail", c.getMail());
//FIXME should be renamed
+ map.put("login",
c.getUsername());
+ map.put("email", c.getEmail()
== null ? "" : c.getEmail());
+ map.put("avsettings",
c.getAllowRecording());
result.add(map);
}
}
Modified:
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java?rev=1642359&r1=1642358&r2=1642359&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
(original)
+++
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
Fri Nov 28 20:30:21 2014
@@ -141,8 +141,8 @@ public class ScopeApplicationAdapter ext
}
InitializationContainer.initComplete = true;
- Version.logOMStarted();
- recordingDao.resetProcessingStatus(); //we are starting so
all processing recordings are now errors
+ Version.logOMStarted();
+ recordingDao.resetProcessingStatus(); //we are starting
so all processing recordings are now errors
} catch (Exception err) {
log.error("[appStart]", err);
}
@@ -184,7 +184,7 @@ public class ScopeApplicationAdapter ext
conferenceLogDao.addConferenceLog("ClientConnect",
rcm.getUser_id(), streamId, null,
rcm.getUserip(),
rcm.getScope(), rcm.getExternalUserId(),
- rcm.getExternalUserType(),
rcm.getMail(),
+ rcm.getExternalUserType(),
rcm.getEmail(),
rcm.getFirstname(), rcm.getLastname());
} catch (Exception err) {
log.error("roomJoin", err);
@@ -533,7 +533,7 @@ public class ScopeApplicationAdapter ext
room_id, currentClient.getUserip(), "",
currentClient.getExternalUserId(),
currentClient.getExternalUserType(),
- currentClient.getMail(),
currentClient.getFirstname(),
+ currentClient.getEmail(),
currentClient.getFirstname(),
currentClient.getLastname());
// Remove User from Sync List's
@@ -735,8 +735,7 @@ public class ScopeApplicationAdapter ext
public synchronized void streamBroadcastClose(IBroadcastStream stream) {
// Notify all the clients that the stream had been closed
- log.debug("start streamBroadcastClose broadcast close: "
- + stream.getPublishedName());
+ log.debug("start streamBroadcastClose broadcast close: " +
stream.getPublishedName());
try {
IConnection current = Red5.getConnectionLocal();
Client rcl =
sessionManager.getClientByStreamId(current.getClient().getId(), null);
@@ -1234,16 +1233,13 @@ public class ScopeApplicationAdapter ext
} else {
return true;
}
-
} else {
-
// FIXME: TODO: For Rooms that are created as
Appointment we
// have to check that too
// but I don't know yet the Logic behind it -
swagner 19.06.2009
return true;
}
-
} catch (Exception err) {
log.error("[checkRoomValues]", err);
}
@@ -1325,7 +1321,7 @@ public class ScopeApplicationAdapter ext
currentClient.getUserip(), "",
currentClient.getExternalUserId(),
currentClient.getExternalUserType(),
- currentClient.getMail(),
currentClient.getFirstname(),
+ currentClient.getEmail(),
currentClient.getFirstname(),
currentClient.getLastname());
// Check for Moderation LogicalRoom ENTER
@@ -1400,9 +1396,7 @@ public class ScopeApplicationAdapter ext
// whatever Role that
should get the Moderation
currentClient.setIsMod(false);
}
-
}
-
}
// Update the Client List
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java?rev=1642359&r1=1642358&r2=1642359&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
Fri Nov 28 20:30:21 2014
@@ -252,7 +252,7 @@ public class MainService implements IPen
currentClient.setFirstname(firstname);
currentClient.setLastname(lastname);
- currentClient.setMail(email);
+ currentClient.setEmail(email);
// Log the User
conferenceLogDao.addConferenceLog(
@@ -260,7 +260,7 @@ public class MainService implements IPen
null, currentClient.getUserip(),
currentClient.getScope(),
currentClient.getExternalUserId(),
currentClient.getExternalUserType(),
- currentClient.getMail(),
currentClient.getFirstname(),
+ currentClient.getEmail(),
currentClient.getFirstname(),
currentClient.getLastname());
this.sessionManager.updateClientByStreamId(streamId,
@@ -337,7 +337,7 @@ public class MainService implements IPen
currentClient.setUserObject(userObject.getUsername(),
userObject.getFirstname(), userObject.getLastname());
currentClient.setPicture_uri(userObject.getPictureUrl());
-
currentClient.setMail(userObject.getEmail());
+
currentClient.setEmail(userObject.getEmail());
log.debug("UPDATE USER BY STREAMID " +
streamId);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java?rev=1642359&r1=1642358&r2=1642359&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
Fri Nov 28 20:30:21 2014
@@ -108,7 +108,7 @@ public class MobileService implements IP
result.put("firstname",
u.getFirstname());
result.put("lastname", u.getLastname());
result.put("login", u.getLogin());
- result.put("mail", u.getAdresses() ==
null ? "" : u.getAdresses().getEmail()); //FIXME should be renamed
+ result.put("email", u.getAdresses() ==
null ? "" : u.getAdresses().getEmail());
result.put("language",
u.getLanguageId()); //TODO rights
}
}
@@ -134,7 +134,9 @@ public class MobileService implements IP
map.put("firstname",
c.getFirstname());
map.put("lastname",
c.getLastname());
map.put("publicSid",
c.getPublicSID());
- map.put("mail", c.getMail());
//FIXME should be renamed
+ map.put("login",
c.getUsername());
+ map.put("email", c.getEmail()
== null ? "" : c.getEmail());
+ map.put("avsettings",
c.getAllowRecording());
result.add(map);
}
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1642359&r1=1642358&r2=1642359&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
Fri Nov 28 20:30:21 2014
@@ -175,7 +175,7 @@ public class ScopeApplicationAdapter ext
conferenceLogDao.addConferenceLog("ClientConnect",
rcm.getUser_id(), streamId, null,
rcm.getUserip(),
rcm.getScope(), rcm.getExternalUserId(),
- rcm.getExternalUserType(),
rcm.getMail(),
+ rcm.getExternalUserType(),
rcm.getEmail(),
rcm.getFirstname(), rcm.getLastname());
} catch (Exception err) {
log.error("roomJoin", err);
@@ -524,7 +524,7 @@ public class ScopeApplicationAdapter ext
room_id, currentClient.getUserip(), "",
currentClient.getExternalUserId(),
currentClient.getExternalUserType(),
- currentClient.getMail(),
currentClient.getFirstname(),
+ currentClient.getEmail(),
currentClient.getFirstname(),
currentClient.getLastname());
// Remove User from Sync List's
@@ -726,8 +726,7 @@ public class ScopeApplicationAdapter ext
public synchronized void streamBroadcastClose(IBroadcastStream stream) {
// Notify all the clients that the stream had been closed
- log.debug("start streamBroadcastClose broadcast close: "
- + stream.getPublishedName());
+ log.debug("start streamBroadcastClose broadcast close: " +
stream.getPublishedName());
try {
IConnection current = Red5.getConnectionLocal();
Client rcl =
sessionManager.getClientByStreamId(current.getClient().getId(), null);
@@ -1305,7 +1304,7 @@ public class ScopeApplicationAdapter ext
currentClient.getUserip(), "",
currentClient.getExternalUserId(),
currentClient.getExternalUserType(),
- currentClient.getMail(),
currentClient.getFirstname(),
+ currentClient.getEmail(),
currentClient.getFirstname(),
currentClient.getLastname());
// Check for Moderation LogicalRoom ENTER
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java?rev=1642359&r1=1642358&r2=1642359&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java
Fri Nov 28 20:30:21 2014
@@ -162,9 +162,9 @@ public class Client implements IDataProv
* @see Client#getCanGiveAudio()
*/
@Column(name = "can_giveaudio")
- private Boolean canGiveAudio = false;
+ private Boolean canGiveAudio = false;
- /**
+ /**
* @see Client#getConnectedSince()
*/
@Column(name = "connected_since")
@@ -251,8 +251,8 @@ public class Client implements IDataProv
/**
* @see Client#getMail()
*/
- @Column(name = "mail")
- private String mail;
+ @Column(name = "email")
+ private String email;
/**
* @see Client#getLastLogin()
@@ -355,21 +355,21 @@ public class Client implements IDataProv
* @see Client#getExternalUserType()
*/
@Column(name = "external_user_type")
- private String externalUserType;
+ private String externalUserType;
- /**
+ /**
* @see Client#getInterviewPodId()
*/
@Column(name = "interview_pod_id")
- private Integer interviewPodId = null;
+ private Integer interviewPodId = null;
- /**
+ /**
* @see Client#getAllowRecording()
*/
@Column(name = "allow_recording")
- private boolean allowRecording = true;
+ private boolean allowRecording = true;
- /**
+ /**
* @see Client#getZombieCheckFlag()
*/
@Column(name = "zombie_check_flag")
@@ -379,21 +379,19 @@ public class Client implements IDataProv
* @see Client#getMicMuted()
*/
@Column(name = "mic_muted")
- private Boolean micMuted = false;
+ private Boolean micMuted = false;
- /**
+ /**
* @see Client#isSipTransport()
*/
@Column(name = "sip_transport")
- private boolean sipTransport = false;
+ private boolean sipTransport = false;
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "server_id")
private Server server;
- public Client() {
-
- }
+ public Client() {}
public Client(String streamid, String publicSID, Long room_id,
Long user_id, String firstname, String lastname,
boolean isAVClient,
@@ -552,12 +550,12 @@ public class Client implements IDataProv
this.lastname = lastname;
}
- public String getMail() {
- return mail;
+ public String getEmail() {
+ return email;
}
- public void setMail(String mail) {
- this.mail = mail;
+ public void setEmail(String email) {
+ this.email = email;
}
public String getOfficial_code() {
@@ -808,7 +806,7 @@ public class Client implements IDataProv
this.canRemote = canRemote;
}
- public Boolean getCanGiveAudio() {
+ public Boolean getCanGiveAudio() {
return canGiveAudio;
}
