Revision: 4149
Author: solomax666
Date: Tue Aug 30 09:22:05 2011
Log: - Roommanager bean was declared static and @Autowired
http://code.google.com/p/openmeetings/source/detail?r=4149
Modified:
/branches/dev/injection/src/app/org/openmeetings/app/rtp/RTPStreamingHandler.java
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/rtp/RTPStreamingHandler.java
Sat Aug 27 03:27:19 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/rtp/RTPStreamingHandler.java
Tue Aug 30 09:22:05 2011
@@ -24,15 +24,15 @@
private static final Logger log = Red5LoggerFactory.getLogger(
RTPStreamingHandler.class,
ScopeApplicationAdapter.webAppRootKey);
+
@Autowired
private Sessionmanagement sessionManagement;
@Autowired
private Usermanagement userManagement;
@Autowired
private ClientListManager clientListManager;
-
@Autowired
- private static Roommanagement roommanagement;
+ private Roommanagement roommanagement;
/** Contains all RTPSessions */
private static HashMap<Rooms, RTPScreenSharingSession> rtpSessions = new
HashMap<Rooms, RTPScreenSharingSession>();
@@ -51,39 +51,8 @@
public static int getNextFreeRTPPort() {
log.debug("getNextFreeRTPPort");
- /*
- * Iterator<Rooms> riter = rtpSessions.keySet().iterator();
- *
- * int currentPort = minimalRTPPort;
- *
- * if(rtpSessions.size() < 1){ log.debug("getNextFreeRTPPort :
" +
- * currentPort); return currentPort; }
- *
- * // TODO also use maximum RTP Port to give admins a chance to
- * administrate a range // of ports that should be open ;-)
- *
- * boolean portBlocked = true;
- *
- * while(portBlocked){
- *
- * while(riter.hasNext()){ Rooms r = riter.next();
- * RTPScreenSharingSession session = rtpSessions.get(r);
- *
- * log.debug("trying Port " + currentPort);
- *
- * if(session.getIncomingRTPPort() == currentPort){ portBlocked
= true;
- * currentPort= currentPort +2; } else portBlocked = false; }
- *
- * // Checked all portBlocked = false;
- *
- * }
- */
-
last_used_port = last_used_port + 2;
- // TODO Check for Range and start from minimal again - checking
- // openSession, if port is still in use...
-
log.debug("getNextFreeRTPPort : " + last_used_port);
return last_used_port;
--
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.
