Revision: 16039
Author: oleg.kulikoff
Date: Fri Dec 24 02:58:35 2010
Log: Issue 1976: Player events
http://code.google.com/p/mobicents/source/detail?r=16039

Modified:
/trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/MediaSessionImpl.java /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/container/ContainerImpl.java /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/container/InvalidateHandler.java /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/container/JoinResponseHandler.java /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/container/LocalConnection.java /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/container/UnjoinResponseHandler.java /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/mediagroup/MediaGroupImpl.java /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/mediagroup/PlayerImpl.java /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/mixer/MediaMixerImpl.java /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/mixer/MixerAdapterImpl.java /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/NetworkConnectionImpl.java

=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/MediaSessionImpl.java Mon Dec 13 22:41:11 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/MediaSessionImpl.java Fri Dec 24 02:58:35 2010
@@ -48,6 +48,8 @@
     private Map attributes = new HashMap();

     private final MsControlFactoryImpl factory;
+
+    private static int reqID;

     public MediaSessionImpl(MsControlFactoryImpl factory) {
         super(null, factory.getDriver(), null);
@@ -73,6 +75,10 @@
     public int getUniqueHandler() {
         return factory.getUniqueHandler();
     }
+
+    public int getUniqueReqID() {
+        return ++reqID;
+    }

public MediaGroup createMediaGroup(Configuration<MediaGroup> pattern) throws MsControlException { MediaConfigImpl config = (MediaConfigImpl) factory.getMediaConfig(pattern);
=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/container/ContainerImpl.java Mon Dec 13 22:41:11 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/container/ContainerImpl.java Fri Dec 24 02:58:35 2010
@@ -6,6 +6,7 @@
 import jain.protocol.ip.mgcp.message.parms.EndpointIdentifier;
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.concurrent.CopyOnWriteArrayList;

 import javax.media.mscontrol.MsControlException;
@@ -157,4 +158,14 @@
     public String toString() {
         return this.getURI().toString();
     }
-}
+
+    protected void unjoin() {
+        for (LocalConnection connection : connections) {
+            connection.unjoinInitiate();
+        }
+    }
+
+    protected Collection<LocalConnection> getConnections() {
+        return this.connections;
+    }
+}
=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/container/InvalidateHandler.java Mon Dec 13 22:41:11 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/container/InvalidateHandler.java Fri Dec 24 02:58:35 2010
@@ -17,6 +17,7 @@
  */
 package org.mobicents.javax.media.mscontrol.container;

+import javax.media.mscontrol.join.JoinEvent;
 import org.mobicents.fsm.State;
 import org.mobicents.fsm.StateEventHandler;

@@ -33,6 +34,9 @@
     }

     public void onEvent(State state) {
+        JoinEventImpl event = new JoinEventImpl(connection.container, null,
+ connection.otherParty.container, JoinEvent.UNJOINED, true, null, null);
+        connection.container.fire(event);
         connection.invalidate();
     }

=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/container/JoinResponseHandler.java Mon Dec 13 22:41:11 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/container/JoinResponseHandler.java Fri Dec 24 02:58:35 2010
@@ -93,7 +93,7 @@

                 //fire event
JoinEventImpl failure = new JoinEventImpl(connection.container, null, - connection.otherParty.container, JoinEvent.JOINED, false, + connection.otherParty.container, JoinEvent.UNJOINED, false, JoinEvent.TOO_MANY_JOINEES, resp.getReturnCode().getComment());
                 connection.container.fire(failure);
                 return true;
=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/container/LocalConnection.java Mon Dec 13 22:41:11 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/container/LocalConnection.java Fri Dec 24 02:58:35 2010
@@ -170,6 +170,10 @@
         } catch (UnknownTransitionException e) {
         }
     }
+
+    public ConnectionIdentifier getID() {
+        return this.ID;
+    }

     protected void invalidate() {
         otherParty = null;
=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/container/UnjoinResponseHandler.java Mon Dec 13 22:41:11 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/container/UnjoinResponseHandler.java Fri Dec 24 02:58:35 2010
@@ -44,10 +44,9 @@
     @Override
     public boolean processResponseEvent(JainMgcpResponseEvent evt) {
         try {
+            System.out.println("connection: " + connection);
+ System.out.println("connection's otherParty: " + connection.otherParty);
             connection.fsm.signal(LocalConnection.SIGNAL_UNJOINED);
- JoinEventImpl event = new JoinEventImpl(connection.container, null, - connection.otherParty.container, JoinEvent.UNJOINED, true, null, null);
-                connection.container.fire(event);
         } catch (UnknownTransitionException e) {
         }
         return true;
=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/mediagroup/MediaGroupImpl.java Wed Dec 22 08:05:53 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/mediagroup/MediaGroupImpl.java Fri Dec 24 02:58:35 2010
@@ -1,9 +1,25 @@
 package org.mobicents.javax.media.mscontrol.mediagroup;

+import jain.protocol.ip.mgcp.JainMgcpCommandEvent;
+import jain.protocol.ip.mgcp.JainMgcpListener;
+import jain.protocol.ip.mgcp.JainMgcpResponseEvent;
+import jain.protocol.ip.mgcp.message.Constants;
+import jain.protocol.ip.mgcp.message.DeleteConnectionResponse;
+import jain.protocol.ip.mgcp.message.NotificationRequest;
+import jain.protocol.ip.mgcp.message.Notify;
+import jain.protocol.ip.mgcp.message.NotifyResponse;
 import jain.protocol.ip.mgcp.message.parms.EndpointIdentifier;
+import jain.protocol.ip.mgcp.message.parms.EventName;
 import jain.protocol.ip.mgcp.message.parms.RequestIdentifier;

+import jain.protocol.ip.mgcp.message.parms.RequestedAction;
+import jain.protocol.ip.mgcp.message.parms.RequestedEvent;
+import jain.protocol.ip.mgcp.message.parms.ReturnCode;
+import jain.protocol.ip.mgcp.pkg.MgcpEvent;
+import jain.protocol.ip.mgcp.pkg.PackageName;
 import java.net.URI;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Iterator;

 import javax.media.mscontrol.MediaConfig;
@@ -11,6 +27,7 @@
 import javax.media.mscontrol.MsControlException;
 import javax.media.mscontrol.mediagroup.MediaGroup;
 import javax.media.mscontrol.mediagroup.Player;
+import javax.media.mscontrol.mediagroup.PlayerEvent;
 import javax.media.mscontrol.mediagroup.Recorder;
 import javax.media.mscontrol.mediagroup.signals.SignalDetector;
 import javax.media.mscontrol.mediagroup.signals.SignalGenerator;
@@ -20,6 +37,7 @@
 import org.mobicents.javax.media.mscontrol.container.ContainerImpl;
 import org.mobicents.javax.media.mscontrol.MediaConfigImpl;
 import org.mobicents.javax.media.mscontrol.MediaSessionImpl;
+import org.mobicents.javax.media.mscontrol.container.LocalConnection;
import org.mobicents.javax.media.mscontrol.mediagroup.signals.SignalDetectorImpl;

 /**
@@ -27,7 +45,7 @@
  * @author amit bhayani
  *
  */
-public class MediaGroupImpl extends ContainerImpl implements MediaGroup {
+public class MediaGroupImpl extends ContainerImpl implements MediaGroup, JainMgcpListener {

public final static MediaConfig PLAYER_CONFIG = new PlayerConfigImpl().getConfig(); public final static MediaConfig SIGNAL_DETECTOR_CONFIG = new SignalDetectorConfig().getConfig();
@@ -43,8 +61,8 @@
     protected SignalDetectorImpl detector = null;
     protected SignalGenerator generator = null;

-    public RequestIdentifier reqId = null;
-
+    public RequestIdentifier reqID = null;
+
public MediaGroupImpl(MediaSessionImpl session, MediaConfigImpl config) throws MsControlException {
         super(session, config.getParameters());
         //determine endpoint local name
@@ -55,6 +73,11 @@
         //finally, the endpoint identifier is constructed
         endpointName = new EndpointIdentifier(localName, domainName);

+        player = new PlayerImpl(this);
+        recorder = new RecorderImpl(this);
+        detector = new SignalDetectorImpl(this);
+
+        session.getDriver().addListener(this);
     }

     // MediaGroup Methods
@@ -112,6 +135,9 @@
     }

     public void release() {
+        //unregister media group as listener
+        session.getDriver().removeListener(this);
+        unjoin();
     }


@@ -153,5 +179,118 @@
         // TODO : Handle RTC
         }

+    }
+
+    protected void sendRequest() {
+        //generate request identifier
+ reqID = new RequestIdentifier(Integer.toString(session.getUniqueReqID())); + NotificationRequest req = new NotificationRequest(this, getEndpoint(), reqID);
+
+ RequestedAction[] actions = new RequestedAction[] { RequestedAction.NotifyImmediately };
+
+        ArrayList<EventName> signalList = new ArrayList();
+        ArrayList<RequestedEvent> eventList = new ArrayList();
+
+        Collection<LocalConnection> connections = this.getConnections();
+        for (LocalConnection c : connections) {
+            //player signals
+ signalList.add(new EventName(PackageName.factory("AU"), MgcpEvent.ann.withParm(player.uri), c.getID()));
+
+            //player events
+ eventList.add(new RequestedEvent(new EventName(PackageName.factory("AU"), MgcpEvent.oc, c.getID()), actions)); + eventList.add(new RequestedEvent(new EventName(PackageName.factory("AU"), MgcpEvent.of, c.getID()), actions));
+        }
+
+        EventName[] signals = new EventName[signalList.size()];
+       signalList.toArray(signals);
+
+        RequestedEvent[] events = new RequestedEvent[eventList.size()];
+        eventList.toArray(events);
+
+        //new EventName(auPackageName, MgcpEvent.oc, connId)
+        req.setRequestedEvents(events);
+        req.setSignalRequests(signals);
+
+ req.setTransactionHandle(getMediaSession().getDriver().getNextTxID()); + req.setNotifiedEntity(getMediaSession().getDriver().getCallAgent());
+
+        getMediaSession().getDriver().send(req);
+    }
+
+    private void operationCompleted() {
+ PlayerEventImpl evt = new PlayerEventImpl(player, PlayerEvent.PLAY_COMPLETED, true);
+        player.fireEvent(evt);
+    }
+
+    /**
+     * Fires event.
+     *
+     * @param evt the event to be fired
+     */
+    private void fireEvent(EventName evt) {
+        switch (evt.getEventIdentifier().intValue()) {
+            case MgcpEvent.REPORT_ON_COMPLETION :
+                operationCompleted();
+                break;
+            case MgcpEvent.REPORT_FAILURE :
+                break;
+        }
+
+    }
+
+    /**
+ * Check if specified endpoint matches to endpoint related to this media group.
+     *
+     * @param enp the endpoint identifier to check.
+ * @return true if specified endpoint identifier matches to endpoint of this group.
+     */
+    private boolean isSameEndpoint(EndpointIdentifier enp) {
+ return enp.getLocalEndpointName().equals(this.endpointName.getLocalEndpointName());
+    }
+
+    /**
+     * Request identifier comparator
+     * @param requestID the request identifier to compare.
+ * @return true if specified request identifier is same as last for last sent request.
+     */
+    private boolean isSameRequest(RequestIdentifier requestID) {
+        return requestID.toString().equals(this.reqID.toString());
+    }
+
+    public void processMgcpCommandEvent(JainMgcpCommandEvent event) {
+        //process commands related to this endpoint only
+        if (!isSameEndpoint(event.getEndpointIdentifier())) {
+            return;
+        }
+
+        JainMgcpResponseEvent response = null;
+
+        switch (event.getObjectIdentifier()) {
+            case Constants.CMD_DELETE_CONNECTION :
+ response = new DeleteConnectionResponse(this, ReturnCode.Transaction_Executed_Normally);
+                break;
+            case Constants.CMD_NOTIFY :
+                Notify notify = (Notify) event;
+ response = new NotifyResponse(this, ReturnCode.Transaction_Executed_Normally);
+
+                if (!this.isSameRequest(notify.getRequestIdentifier())) {
+                    break;
+                }
+
+                EventName[] events = notify.getObservedEvents();
+                for (EventName evt: events) {
+                    fireEvent(evt);
+                }
+                break;
+            default :
+                return;
+        }
+
+        response.setTransactionHandle(event.getTransactionHandle());
+        session.getDriver().send(response);
+    }
+
+    public void processMgcpResponseEvent(JainMgcpResponseEvent event) {
+        System.out.println("Receive response: " + event);
     }
 }
=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/mediagroup/PlayerImpl.java Wed Dec 22 08:05:53 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/mediagroup/PlayerImpl.java Fri Dec 24 02:58:35 2010
@@ -1,13 +1,9 @@
 package org.mobicents.javax.media.mscontrol.mediagroup;


-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
 import java.net.URI;
 import java.util.concurrent.CopyOnWriteArrayList;

-import javax.media.mscontrol.MediaErr;
 import javax.media.mscontrol.MediaEventListener;
 import javax.media.mscontrol.MediaSession;
 import javax.media.mscontrol.MsControlException;
@@ -18,6 +14,8 @@
 import javax.media.mscontrol.resource.RTC;

 import org.mobicents.fsm.FSM;
+import org.mobicents.fsm.State;
+import org.mobicents.fsm.TransitionHandler;
 import org.mobicents.fsm.UnknownTransitionException;

 /**
@@ -54,6 +52,7 @@

protected CopyOnWriteArrayList<MediaEventListener<PlayerEvent>> listeners = new CopyOnWriteArrayList<MediaEventListener<PlayerEvent>>();

+    protected String uri;

//-------------------------------------------------------------------------------------------/

@@ -69,16 +68,19 @@
         fsm.createState(STATE_ACTIVE);
         fsm.createState(STATE_PAUSED);

+        fsm.setStart(STATE_IDLE);
+        fsm.setEnd(STATE_PAUSED);
+
         //state IDLE
-        fsm.createTransition(SIGNAL_PLAY, STATE_IDLE, STATE_ACTIVE);
+ fsm.createTransition(SIGNAL_PLAY, STATE_IDLE, STATE_ACTIVE).setHandler(new PlayRequest()); fsm.createTransition(SIGNAL_START_PAUSED, STATE_IDLE, STATE_PAUSED);

         //state ACTIVE
fsm.createTransition(SIGNAL_PLAY_COMPLETED, STATE_ACTIVE, STATE_IDLE);
-        fsm.createTransition(SIGNAL_PAUSE, STATE_ACTIVE, STATE_PAUSED);
+ fsm.createTransition(SIGNAL_PAUSE, STATE_ACTIVE, STATE_PAUSED).setHandler(new PauseRequest());

         //state PAUSED
-        fsm.createTransition(SIGNAL_STOP, STATE_PAUSED, STATE_IDLE);
+ fsm.createTransition(SIGNAL_STOP, STATE_PAUSED, STATE_IDLE).setHandler(new StopRequest());
         fsm.createTransition(SIGNAL_RESUME, STATE_PAUSED, STATE_ACTIVE);

     }
@@ -100,6 +102,7 @@
         this.checkURI(uris);

         try {
+            this.uri = uri.toString();
             fsm.signal(SIGNAL_PLAY);
         } catch (UnknownTransitionException e) {
             throw new MsControlException(e.getMessage());
@@ -142,27 +145,6 @@
             if (uri.getScheme().equalsIgnoreCase("data")) {
                 continue;
             }
-            InputStream is = null;
-            try {
-                is = uri.toURL().openStream();
-            } catch (MalformedURLException e) {
- PlayerEventImpl event = new PlayerEventImpl(this, PlayerEvent.PLAY_COMPLETED, false, MediaErr.BAD_ARG,
-                        "Error " + e.getMessage());
-                this.update(event);
-                break;
-            } catch (IOException e) {
- PlayerEventImpl event = new PlayerEventImpl(this, PlayerEvent.PLAY_COMPLETED, false,
-                        MediaErr.NOT_FOUND, "Error " + e.getMessage());
-                this.update(event);
-                break;
-            } finally {
-                if (is != null) {
-                    try {
-                        is.close();
-                    } catch (IOException e) {
-                    }
-                }
-            }
         }
     }

@@ -173,4 +155,43 @@
         }
     }

-}
+    protected void fireEvent(PlayerEvent event) {
+        for (MediaEventListener l : listeners) {
+            l.onEvent(event);
+        }
+    }
+
+    private class PlayRequest implements TransitionHandler {
+
+        public void process(State state) {
+            System.out.println("Sending Request-------------->");
+            parent.sendRequest();
+        }
+
+    }
+
+    private class PauseRequest implements TransitionHandler {
+
+        public void process(State state) {
+        }
+
+    }
+
+    private class ResumeRequest implements TransitionHandler {
+
+        public void process(State state) {
+
+        }
+
+    }
+
+    private class StopRequest implements TransitionHandler {
+
+        public void process(State state) {
+            parent.sendRequest();
+        }
+
+    }
+
+
+}
=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/mixer/MediaMixerImpl.java Mon Dec 13 22:41:11 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/mixer/MediaMixerImpl.java Fri Dec 24 02:58:35 2010
@@ -12,14 +12,12 @@
 import javax.media.mscontrol.MediaObject;
 import javax.media.mscontrol.MsControlException;
 import javax.media.mscontrol.Parameters;
-import javax.media.mscontrol.join.Joinable;
 import javax.media.mscontrol.mixer.MediaMixer;
 import javax.media.mscontrol.mixer.MixerAdapter;
 import javax.media.mscontrol.mixer.MixerEvent;
 import javax.media.mscontrol.resource.Action;
 import javax.media.mscontrol.resource.AllocationEventListener;

-import org.apache.log4j.Logger;
 import org.mobicents.javax.media.mscontrol.container.ContainerImpl;
 import org.mobicents.javax.media.mscontrol.MediaConfigImpl;
 import org.mobicents.javax.media.mscontrol.MediaSessionImpl;
@@ -33,14 +31,12 @@

public final static MediaConfig AUDIO_CONFIG = new MixerAudioConfig().getConfig();

-    public static Logger logger = Logger.getLogger(MediaMixerImpl.class);
- protected List<MixerAdapter> mxAdaptList = new ArrayList<MixerAdapter>(); - protected CopyOnWriteArrayList<MediaEventListener<? extends MediaEvent<?>>> mediaEventListenerList = new CopyOnWriteArrayList<MediaEventListener<? extends MediaEvent<?>>>();
+    protected List<MixerAdapter> adaptors = new ArrayList<MixerAdapter>();
+ protected CopyOnWriteArrayList<MediaEventListener<? extends MediaEvent<?>>> listeners = new CopyOnWriteArrayList<MediaEventListener<? extends MediaEvent<?>>>();

public MediaMixerImpl(MediaSessionImpl mediaSession, MediaConfigImpl config) throws MsControlException {
         super(mediaSession, config.getParameters());
         this.config = config;
-        System.out.println("uri: " + getURI());
     }

public MixerAdapter createMixerAdapter(Configuration<MixerAdapter> paramConfiguration) throws MsControlException {
@@ -52,7 +48,7 @@
MediaConfigImpl config = (MediaConfigImpl) this.session.getMsControlFactoryImpl().getMediaConfig(
         paramConfiguration);
MixerAdapter mixerAdapter = new MixerAdapterImpl(this, this.session, config, null);
-        mxAdaptList.add(mixerAdapter);
+        adaptors.add(mixerAdapter);
         return mixerAdapter;
          */
         return null;
@@ -68,7 +64,7 @@
         paramConfiguration);
MixerAdapter mixerAdapter = new MixerAdapterImpl(this, this.session, config,
         paramParameters);
-        mxAdaptList.add(mixerAdapter);
+        adaptors.add(mixerAdapter);
         return mixerAdapter;
          */
         return null;
@@ -82,7 +78,7 @@
         /*
MixerAdapter mixerAdapter = new MixerAdapterImpl(this, this.session,
         (MediaConfigImpl) paramMediaConfig, paramParameters);
-        mxAdaptList.add(mixerAdapter);
+        adaptors.add(mixerAdapter);
         return mixerAdapter;
          */
         return null;
@@ -107,24 +103,15 @@
     }

     public void release() {
-        try {
-            Joinable[] joinableArray = this.getJoinees();
-            for (Joinable joinable : joinableArray) {
-                this.unjoinInitiate(joinable, this);
-            }
-        } catch (MsControlException e) {
-            logger.error("release of NetworkConnection failed ", e);
-        }
-
-        this.session.getMedMxrList().remove(this);
+        unjoin();
     }

     public void addListener(MediaEventListener<MixerEvent> listener) {
-        this.mediaEventListenerList.add(listener);
+        this.listeners.add(listener);
     }

     public void removeListener(MediaEventListener<MixerEvent> listener) {
-        this.mediaEventListenerList.remove(listener);
+        this.listeners.remove(listener);
     }

     public Iterator<MediaObject> getMediaObjects() {
=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/mixer/MixerAdapterImpl.java Mon Dec 13 22:41:11 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/mixer/MixerAdapterImpl.java Fri Dec 24 02:58:35 2010
@@ -44,7 +44,7 @@
                                                                + passedId);
                        }

-                       for (MixerAdapter mixAda : 
this.mediaMixerImpl.mxAdaptList) {
+                       for (MixerAdapter mixAda : 
this.mediaMixerImpl.adaptors) {
                                if (((ContainerImpl) 
mixAda).getId().compareTo(passedId) == 0) {
throw new MsControlException("Duplicate MEDIAOBJECT_ID = " + passedId);
                                }
@@ -99,7 +99,7 @@


        public void release() {
-               this.mediaMixerImpl.mxAdaptList.remove(this);
+               this.mediaMixerImpl.adaptors.remove(this);
        }


=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/NetworkConnectionImpl.java Mon Dec 13 22:41:11 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/NetworkConnectionImpl.java Fri Dec 24 02:58:35 2010
@@ -223,6 +223,11 @@


     public void release() {
+ System.out.println("****************RELEASE CONNECTION CALLED ***********************");
+        //send signal to all local connections
+        this.unjoin();
+
+        //send signal to network connection
         try {
             fsm.signal(ConnectionTransition.CLOSE);
         } catch (UnknownTransitionException e) {

Reply via email to