Author: solomax
Date: Tue Dec 11 03:28:23 2012
New Revision: 1419982
URL: http://svn.apache.org/viewvc?rev=1419982&view=rev
Log:
SVNKit and MySQL libraries are bumped
Methods in the ScopeApplicationAdapter are corrected to work properly with null
userId.
Modified:
incubator/openmeetings/trunk/singlewebapp/ivy.xml
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
Modified: incubator/openmeetings/trunk/singlewebapp/ivy.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/ivy.xml?rev=1419982&r1=1419981&r2=1419982&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/ivy.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/ivy.xml Tue Dec 11 03:28:23 2012
@@ -289,7 +289,7 @@
<!-- END OF DTD -->
<!-- START OF svntask -->
- <dependency org="org.tmatesoft.svnkit" name="svnkit"
rev="1.7.5" conf="svntask->*" transitive="true">
+ <dependency org="org.tmatesoft.svnkit" name="svnkit"
rev="1.7.6" conf="svntask->*" transitive="true">
<include type="jar" />
</dependency>
<dependency org="svnant" name="svnant" rev="1.3.1"
conf="svntask->*" transitive="false">
@@ -314,7 +314,7 @@
<!-- END OF Command Line Admin -->
<!-- START OF MySQL Driver -->
- <dependency org="mysql" name="mysql-connector-java" rev="5.1.9"
conf="mysql->*" transitive="false">
+ <dependency org="mysql" name="mysql-connector-java"
rev="5.1.22" conf="mysql->*" transitive="false">
<include type="jar" />
</dependency>
<!-- END OF MySQL Driver -->
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java?rev=1419982&r1=1419981&r2=1419982&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
Tue Dec 11 03:28:23 2012
@@ -1444,10 +1444,12 @@ public class ScopeApplicationAdapter ext
// Inject externalUserId if nothing is set yet
if (currentClient.getExternalUserId() == null) {
- Users us =
usersDao.get(currentClient.getUser_id());
- if (us != null) {
-
currentClient.setExternalUserId(us.getExternalUserId());
-
currentClient.setExternalUserType(us.getExternalUserType());
+ if (currentClient.getUser_id() != null) {
+ Users us =
usersDao.get(currentClient.getUser_id());
+ if (us != null) {
+
currentClient.setExternalUserId(us.getExternalUserId());
+
currentClient.setExternalUserType(us.getExternalUserType());
+ }
}
}
@@ -1732,20 +1734,20 @@ public class ScopeApplicationAdapter ext
// Update Session Data
sessionManagement.updateUserWithoutSession(SID, userId);
- Users user = userManagement.getUserById(userId);
-
- if (user != null) {
-
currentClient.setExternalUserId(user.getExternalUserId());
-
currentClient.setExternalUserType(user.getExternalUserType());
- }
-
// only fill this value from User-Record
- // cause invited users have non
+ // cause invited users have no associated User, so
// you cannot set the firstname,lastname from the
UserRecord
- Users us = usersDao.get(userId);
- if (us != null && us.getPictureuri() != null) {
- // set Picture-URI
-
currentClient.setPicture_uri(us.getPictureuri());
+ if (userId != null) {
+ Users us = usersDao.get(userId);
+
+ if (us != null) {
+
currentClient.setExternalUserId(us.getExternalUserId());
+
currentClient.setExternalUserType(us.getExternalUserType());
+ }
+ if (us != null && us.getPictureuri() != null) {
+ // set Picture-URI
+
currentClient.setPicture_uri(us.getPictureuri());
+ }
}
this.clientListManager.updateClientByStreamId(streamid,
currentClient, false);
