openmeetings-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From solo...@apache.org
Subject svn commit: r1436229 - in /incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings: remote/ remote/red5/ remote/util/ servlet/outputhandler/
Date Mon, 21 Jan 2013 08:54:26 GMT
Author: solomax
Date: Mon Jan 21 08:54:26 2013
New Revision: 1436229

URL: http://svn.apache.org/viewvc?rev=1436229&view=rev
Log:
NPE while import is fixed;
code clean up;

Modified:
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/util/SessionVariablesUtil.java
    incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java?rev=1436229&r1=1436228&r2=1436229&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java
(original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java
Mon Jan 21 08:54:26 2013
@@ -743,7 +743,7 @@ public class ConferenceService {
 	 * Get some statistics about the current sessions handled by this instance
 	 * 
 	 * @param SID
-	 * @return
+	 * @return - session statistics as String
 	 */
 	public String getSessionStatistics(String SID) {
 		try {

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=1436229&r1=1436228&r2=1436229&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
Mon Jan 21 08:54:26 2013
@@ -2546,7 +2546,7 @@ public class ScopeApplicationAdapter ext
 	 * @deprecated this method should be reworked to use a single SQL query in
 	 *             the cache to get any client in the current room that is
 	 *             recording instead of iterating through connections!
-	 * @return
+	 * @return true in case there is recording session, false otherwise, null if any exception
happend
 	 */
 	public synchronized Boolean getInterviewRecordingStatus() {
 		try {
@@ -2582,7 +2582,7 @@ public class ScopeApplicationAdapter ext
 
 	/**
 	 * @deprecated @see {@link ScopeApplicationAdapter#getInterviewRecordingStatus()}
-	 * @return
+	 * @return - false if there were existing recording, true if recording was started successfully,
null if any exception happens
 	 */
 	public synchronized Boolean startInterviewRecording() {
 		try {

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/util/SessionVariablesUtil.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/util/SessionVariablesUtil.java?rev=1436229&r1=1436228&r2=1436229&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/util/SessionVariablesUtil.java
(original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/util/SessionVariablesUtil.java
Mon Jan 21 08:54:26 2013
@@ -73,7 +73,7 @@ public class SessionVariablesUtil {
 	/**
 	 * if there is no user id set, it will return Long.MIN_VALUE
 	 * @param client
-	 * @return
+	 * @return - user id set or Long.MIN_VALUE or null if any exception happens
 	 */
 	public static Long getUserId(IClient client) {
 		try {

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java?rev=1436229&r1=1436228&r2=1436229&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java
(original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java
Mon Jan 21 08:54:26 2013
@@ -371,7 +371,7 @@ public class BackupImportController exte
 
 				// We need to reset this as openJPA reject to store them otherwise
 				a.setAppointmentId(null);
-				if (a.getUserId().getUser_id() == null) {
+				if (a.getUserId() != null && a.getUserId().getUser_id() == null) {
 					a.setUserId(null);
 				}
 				Long newAppId = appointmentDao.addAppointmentObj(a);



Mime
View raw message