Revision: 4022
Author: seba.wagner
Date: Sat Aug 6 00:21:58 2011
Log: Fix some code Issues
http://code.google.com/p/openmeetings/source/detail?r=4022
Modified:
/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
/trunk/singlewebapp/src/app/org/openmeetings/app/ldap/LdapLoginManagement.java
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/WhiteBoardService.java
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/OpenXGHttpClient.java
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/Export.java
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/Import.java
/trunk/singlewebapp/src/client/org/openmeetings/client/gui/ClientViewerScreen.java
/trunk/singlewebapp/src/screenviewer/RTPPlayerApplet.java
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
Sat Jul 23 04:28:08 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
Sat Aug 6 00:21:58 2011
@@ -257,6 +257,11 @@
Appointment point = getAppointMentById(appointmentId);
+ if(point == null){
+ log.error("No appointment found for ID " +
appointmentId);
+ return null;
+ }
+
if (point.getIsConnectedEvent() != null && point.getIsConnectedEvent())
{
List<Appointment> appointments =
AppointmentDaoImpl.getInstance().getAppointmentsByRoomId(point.getRoom().getRooms_id());
@@ -271,11 +276,6 @@
}
}
-
- if(point == null){
- log.error("No appointment found for ID " +
appointmentId);
- return null;
- }
Rooms room = point.getRoom();
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/ldap/LdapLoginManagement.java
Sat Jul 23 04:28:08 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/ldap/LdapLoginManagement.java
Sat Aug 6 00:21:58 2011
@@ -454,21 +454,24 @@
// Return UserObject
Users u2 =
Usermanagement.getInstance().getUserById(userid);
+
+ if(u2 == null)
+ return new Long(-1);
+
u2.setExternalUserType(EXTERNAL_USER_TYPE_LDAP); //TIBO
//initialize lazy collection
Usermanagement.getInstance().refreshUserObject(u2);
- if(u2 == null)
- return userid;
+
log.debug("getUserbyId : " + userid + " : " +
u2.getLogin());
return u2;
}catch(Exception e){
- log.error("Error on Working Userdata : " +
e.getMessage());
- return null;
+ log.error("Error on Working Userdata : " , e);
+ return new Long(-1);
}
}
else{
@@ -501,7 +504,7 @@
Usermanagement.getInstance().updateUserObject(u,true );
}catch(Exception e){
log.error("Error updating user : " +
e.getMessage());
- return null;
+ return new Long(-1);
}
return u;
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/WhiteBoardService.java
Sat Jul 23 04:28:08 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/WhiteBoardService.java
Sat Aug 6 00:21:58 2011
@@ -789,12 +789,15 @@
} else {
if (rcl != null) {
((IServiceCapableConnection)
conn).invoke("sendImagesSyncCompleteFlag", new Object[] { "remove" },this);
- } else if
(!rcl.getPublicSID().equals(currentClient.getPublicSID())) {
+
}
+
/*
+ else if
(!rcl.getPublicSID().equals(currentClient.getPublicSID())) {
//do not send to current
((IServiceCapableConnection)
conn).invoke("sendImagesSyncCompleteFlag", new Object[] { "remove" },this);
} else {
log.debug("IS current");
}
+
*/
}
}
}
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
Wed Aug 3 10:26:21 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
Sat Aug 6 00:21:58 2011
@@ -865,9 +865,7 @@
} else {
RoomClient rcl =
this.clientListManager.getClientByStreamId(conn.getClient().getId());
if (rcl !=
null){
- if (rcl
== null) {
-
//continue;
- } else if (rcl.getIsScreenClient() != null &&
rcl.getIsScreenClient()) {
+ if
(rcl.getIsScreenClient() != null && rcl.getIsScreenClient()) {
//continue;
} else {
log.debug("is this users still alive? :"+rcl);
@@ -986,7 +984,7 @@
for (IConnection conn : conset) {
if (conn != null) {
RoomClient rcl =
this.clientListManager.getClientByStreamId(conn.getClient().getId());
- log.debug("Send Flag to Client:
"+rcl.getUsername());
+
if (rcl == null) {
//continue;
} else if (conn instanceof
IServiceCapableConnection) {
@@ -2685,7 +2683,7 @@
if
(!rcl.getPublicSID().equals(publicSID)){
boolean
sharerOnList = false;
- for (int
i=0;i<rcl.getSharerSIDs().size();i++) {
+ if
(rcl.getSharerSIDs().size()>0) {
sharerOnList = true;
break;
}
@@ -2766,7 +2764,7 @@
if
(!rcl.getPublicSID().equals(publicSID)){
boolean
sharerOnList = false;
- for (int
i=0;i<rcl.getSharerSIDs().size();i++) {
+ if
(rcl.getSharerSIDs().size()>0) {
sharerOnList = true;
break;
}
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/OpenXGHttpClient.java
Sat Jul 23 04:28:08 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/OpenXGHttpClient.java
Sat Aug 6 00:21:58 2011
@@ -126,7 +126,7 @@
//adminid
Configuration openxg_adminid =
Configurationmanagement.getInstance().getConfKey(3L, "openxg.adminid");
- if (openxg_language_code == null) {
+ if (openxg_adminid == null) {
throw new Exception("openxg.adminid missing in
Configuration table");
}
String adminid = openxg_adminid.getConf_value();
@@ -275,7 +275,7 @@
//adminid
Configuration openxg_adminid =
Configurationmanagement.getInstance().getConfKey(3L, "openxg.adminid");
- if (openxg_language_code == null) {
+ if (openxg_adminid == null) {
throw new Exception("openxg.adminid missing in
Configuration table");
}
String adminid = openxg_adminid.getConf_value();
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/Export.java
Sat Jul 23 04:28:08 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/Export.java
Sat Aug 6 00:21:58 2011
@@ -18,6 +18,7 @@
import org.dom4j.Element;
import org.dom4j.io.OutputFormat;
import org.dom4j.io.XMLWriter;
+import org.openmeetings.app.data.basic.AuthLevelmanagement;
import org.openmeetings.app.data.basic.Sessionmanagement;
import org.openmeetings.app.data.user.Organisationmanagement;
import org.openmeetings.app.data.user.Usermanagement;
@@ -64,7 +65,7 @@
System.out.println("user_level: " + user_level);
// if (user_level!=null && user_level > 0) {
- if (true) {
+ if
(AuthLevelmanagement.getInstance().checkUserLevel(user_level)) {
String moduleName =
httpServletRequest.getParameter("moduleName");
if (moduleName == null) {
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/Import.java
Sat Jul 23 04:28:08 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/Import.java
Sat Aug 6 00:21:58 2011
@@ -18,6 +18,7 @@
import org.dom4j.Document;
import org.dom4j.Element;
import org.dom4j.io.SAXReader;
+import org.openmeetings.app.data.basic.AuthLevelmanagement;
import org.openmeetings.app.data.basic.Sessionmanagement;
import org.openmeetings.app.data.user.Addressmanagement;
import org.openmeetings.app.data.user.Emailmanagement;
@@ -71,7 +72,7 @@
log.debug("moduleName: " + moduleName);
// if (user_level!=null && user_level > 0) {
- if (true) {
+ if
(AuthLevelmanagement.getInstance().checkAdminLevel(user_level)) {
if (moduleName.equals("users")) {
log.error("Import Users");
String organisation =
httpServletRequest.getParameter("secondid");
=======================================
---
/trunk/singlewebapp/src/client/org/openmeetings/client/gui/ClientViewerScreen.java
Sat Nov 21 06:34:35 2009
+++
/trunk/singlewebapp/src/client/org/openmeetings/client/gui/ClientViewerScreen.java
Sat Aug 6 00:21:58 2011
@@ -251,8 +251,9 @@
this.showBandwidthWarning("Receive updateCursor");;
- if (true) return;
-
+ //if (true) return;
+
+ /*
if (!this.mousePointerLoaded) {
this.menupointerPanel = new ImagePanel(clientCursorStatus.getX(),
clientCursorStatus.getY());
@@ -264,6 +265,7 @@
this.menupointerPanel.setBounds(clientCursorStatus.getX(),
clientCursorStatus.getY(), 22, 22);
this.menupointerPanel.repaint();
+ */
//this.menupointerPanel.setImages(menupointer.getImage(), 22, 22);
=======================================
--- /trunk/singlewebapp/src/screenviewer/RTPPlayerApplet.java Mon Oct 12
02:56:03 2009
+++ /trunk/singlewebapp/src/screenviewer/RTPPlayerApplet.java Sat Aug 6
00:21:58 2011
@@ -334,8 +334,6 @@
videomgr = mymgr;
if (media.equals("audio"))
audiomgr = mymgr;
- if (mymgr == null)
- return null;
mymgr.addReceiveStreamListener(this);
//if (media.equals("audio"))
// EncodingUtil.Init((SessionManager)mymgr);
--
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.
