3 new revisions:

Revision: f4fbaf2a8f32
Author:   gvagenas <[email protected]>
Date:     Tue Nov 27 02:24:40 2012
Log: JSR309 mixer needs all connections to be on the same MediaSession in...
http://code.google.com/p/sipservlets/source/detail?r=f4fbaf2a8f32

Revision: 5f4dcac03604
Author:   gvagenas <[email protected]>
Date:     Tue Nov 27 02:25:17 2012
Log:      Merge branch 'ConferenceJSR309Demo'
http://code.google.com/p/sipservlets/source/detail?r=5f4dcac03604

Revision: a3b8c41870dc
Author:   gvagenas <[email protected]>
Date:     Tue Nov 27 02:25:30 2012
Log:      Merge remote-tracking branch 'origin/master'
http://code.google.com/p/sipservlets/source/detail?r=a3b8c41870dc

==============================================================================
Revision: f4fbaf2a8f32
Author:   gvagenas <[email protected]>
Date:     Tue Nov 27 02:24:40 2012
Log: JSR309 mixer needs all connections to be on the same MediaSession in
order to be able to mix them.
http://code.google.com/p/sipservlets/source/detail?r=f4fbaf2a8f32

Modified:
/sip-servlets-examples/conference-demo-jsr309/src/main/java/org/mobicents/servlet/sip/conference/server/ConferenceServlet.java

=======================================
--- /sip-servlets-examples/conference-demo-jsr309/src/main/java/org/mobicents/servlet/sip/conference/server/ConferenceServlet.java Mon Nov 5 06:53:05 2012 +++ /sip-servlets-examples/conference-demo-jsr309/src/main/java/org/mobicents/servlet/sip/conference/server/ConferenceServlet.java Tue Nov 27 02:24:40 2012
@@ -159,7 +159,7 @@
                                try {
                                        ConferenceConnectionListener listener =
                                                new 
ConferenceConnectionListener(response);
- MediaSession mediaSession = MsControlObjects.msControlFactory.createMediaSession(); +// MediaSession mediaSession = MsControlObjects.msControlFactory.createMediaSession();
                                        NetworkConnection conn = mediaSession
                                        
.createNetworkConnection(NetworkConnection.BASIC);


==============================================================================
Revision: 5f4dcac03604
Author:   gvagenas <[email protected]>
Date:     Tue Nov 27 02:25:17 2012
Log:      Merge branch 'ConferenceJSR309Demo'
http://code.google.com/p/sipservlets/source/detail?r=5f4dcac03604



==============================================================================
Revision: a3b8c41870dc
Author:   gvagenas <[email protected]>
Date:     Tue Nov 27 02:25:30 2012
Log:      Merge remote-tracking branch 'origin/master'
http://code.google.com/p/sipservlets/source/detail?r=a3b8c41870dc


Reply via email to