Revision: 15652
Author: oleg.kulikoff
Date: Tue Dec  7 01:45:47 2010
Log: Timeout and error handling inside FSM
http://code.google.com/p/mobicents/source/detail?r=15652

Added:
/trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/TimeoutError.java
Modified:
 /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/fsm/FSM.java
/trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/fsm/State.java /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/fsm/Transition.java /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/networkconnection/CreateConnectionRequest.java /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/CreateConnectionResponseHandler.java /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/DeleteConnectionRequest.java /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/ModifyConnectionRequest.java /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/ModifyConnectionResponseHandler.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/networkconnection/SdpPortManagerEventImpl.java /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/SdpPortManagerImpl.java /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/fsm/ConnectionState.java /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/spi/DriverImpl.java /trunk/servers/media/jsr-309/core/src/test/java/org/mobicents/fsm/FSMTest.java

=======================================
--- /dev/null
+++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/TimeoutError.java Tue Dec 7 01:45:47 2010
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright XXXX, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a full listing
+ * of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU General Public License, v. 2.0.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License,
+ * v. 2.0 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+package org.mobicents.javax.media.mscontrol.networkconnection;
+
+import javax.media.mscontrol.MediaErr;
+import org.mobicents.fsm.State;
+import org.mobicents.fsm.TransitionHandler;
+
+/**
+ *
+ * @author kulikov
+ */
+public class TimeoutError implements TransitionHandler {
+
+    private NetworkConnectionImpl connection;
+
+    public TimeoutError(NetworkConnectionImpl connection) {
+        this.connection = connection;
+    }
+
+    public void process(State state) {
+        connection.error = MediaErr.TIMEOUT;
+        connection.errorMsg = "Wait timeout in state " + state.getName();
+    }
+
+}
=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/fsm/FSM.java Tue Nov 30 08:24:58 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/fsm/FSM.java Tue Dec 7 01:45:47 2010
@@ -17,19 +17,21 @@
  */
 package org.mobicents.fsm;

-import java.util.Collection;
+import java.io.Serializable;
 import java.util.HashMap;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.locks.ReentrantLock;

 /**
  *
  * @author kulikov
  */
-public class FSM implements Runnable {
+public class FSM implements Runnable, Serializable {

     //first and last states in fsm
-    private State start;
-    private State end;
+    protected State start;
+    protected State end;

     //intermediate states
     private HashMap<String, State> states = new HashMap();
@@ -38,6 +40,14 @@
     private ReentrantLock lock = new ReentrantLock();

     private HashMap attributes = new HashMap();
+
+    //state timer
+    protected ScheduledExecutorService scheduler;
+    protected ScheduledFuture timer;
+
+    public FSM(ScheduledExecutorService scheduler) {
+        this.scheduler = scheduler;
+    }

     public State getState() {
         return state;
@@ -142,9 +152,8 @@
     public void run() {
         lock.lock();
         try {
-            Collection<State> list = states.values();
-            for (State s : list) {
-                s.tick(System.currentTimeMillis());
+            if (state != null && state != start && state != end) {
+                state.tick(System.currentTimeMillis());
             }
         } finally {
             lock.unlock();
=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/fsm/State.java Tue Nov 30 08:24:58 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/fsm/State.java Tue Dec 7 01:45:47 2010
@@ -19,6 +19,7 @@
 package org.mobicents.fsm;

 import java.util.ArrayList;
+import java.util.concurrent.TimeUnit;

 /**
  * Implements single state of the FSM.
@@ -56,6 +57,11 @@
         if (this.enterEventHandler != null) {
             this.enterEventHandler.onEvent(this);
         }
+
+        //if this is end state we have to cancel timer generator
+        if (this == fsm.end) {
+            fsm.timer.cancel(false);
+        }
     }

     protected void leave() {
@@ -63,6 +69,12 @@
         if (this.exitEventHandler != null) {
             this.exitEventHandler.onEvent(this);
         }
+
+ //leaving start state? process started and we need to start time marks scheduler
+        //for timeout measurement
+        if (this == fsm.start) {
+ fsm.timer = fsm.scheduler.scheduleAtFixedRate(fsm, 0, 1, TimeUnit.SECONDS);
+        }
     }

     protected void tick(long now) {
@@ -113,4 +125,9 @@
         }
         return null;
     }
-}
+
+    @Override
+    public String toString() {
+        return name;
+    }
+}
=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/fsm/Transition.java Tue Nov 30 08:24:58 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/fsm/Transition.java Tue Dec 7 01:45:47 2010
@@ -54,4 +54,9 @@
         this.destination.enter();
         return this.destination;
     }
-}
+
+    @Override
+    public String toString() {
+        return name;
+    }
+}
=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/MediaSessionImpl.java Tue Nov 30 08:24:58 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/MediaSessionImpl.java Tue Dec 7 01:45:47 2010
@@ -263,6 +263,10 @@
         return connections;
     }

+    public void removeConnection(NetworkConnectionImpl connection) {
+        connections.remove(connection);
+    }
+
     public List<MediaGroup> getMedGrpList() {
         return groups;
     }
=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/CreateConnectionRequest.java Mon Dec 6 04:04:45 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/CreateConnectionRequest.java Tue Dec 7 01:45:47 2010
@@ -59,7 +59,7 @@
         }

         //create handler for this tx
-//        new CreateConnectionResponseHandler(txHandle);
+        new CreateConnectionResponseHandler(txHandle, connection);
         //send request
         connection.getSession().getDriver().send(req);
     }
=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/CreateConnectionResponseHandler.java Mon Dec 6 04:04:45 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/CreateConnectionResponseHandler.java Tue Dec 7 01:45:47 2010
@@ -22,6 +22,7 @@
 import jain.protocol.ip.mgcp.JainMgcpResponseEvent;
 import jain.protocol.ip.mgcp.message.CreateConnectionResponse;
 import jain.protocol.ip.mgcp.message.parms.ReturnCode;
+import javax.media.mscontrol.MediaErr;
 import org.mobicents.fsm.UnknownTransitionException;
import org.mobicents.javax.media.mscontrol.networkconnection.fsm.ConnectionTransition;
 import org.mobicents.javax.media.mscontrol.spi.MgcpTransactionHandler;
@@ -63,39 +64,42 @@
                     }
                 } catch (UnknownTransitionException e) {
                 }
+
                 return true;
-/*                switch (connection.state) {
-                    case OPENING:
- //extract endpoint name, connection id and local descriptor
-                        updateParameters(resp);
-                        connection.state = ConnectionState.HALF_OPENED;
- fireEvent(SdpPortManagerEvent.OFFER_GENERATED, true, null, null);
-                        break;
-                    case OPENING_WITH_REMOTE_SDP:
- //extract endpoint name, connection id and local descriptor
-                        updateParameters(resp);
-                        connection.state = ConnectionState.OPENED;
- fireEvent(SdpPortManagerEvent.ANSWER_GENERATED, true, null, null);
-                        break;
-                    default:
-                    //ignore
-                }
- */
             case ReturnCode.ENDPOINT_UNKNOWN :
-                try {
-                    connection.fsm.signal(ConnectionTransition.FAILURE);
-                } catch (UnknownTransitionException e) {
-                }
-// fireEvent(SdpPortManagerEvent.NETWORK_STREAM_FAILURE, false, -// SdpPortManagerEvent.RESOURCE_UNAVAILABLE, resp.getReturnCode().getComment());
-                return true;
+                connection.error = MediaErr.NOT_FOUND;
+                break;
+            case ReturnCode.ENDPOINT_NOT_READY :
+                connection.error = MediaErr.RESOURCE_UNAVAILABLE;
+                break;
+            case ReturnCode.ENDPOINT_IS_RESTARTING :
+                connection.error = MediaErr.RESOURCE_UNAVAILABLE;
+                break;
+            case ReturnCode.ENDPOINT_INSUFFICIENT_RESOURCES :
+                connection.error = MediaErr.RESOURCE_UNAVAILABLE;
+                break;
+            case ReturnCode.INCOMPATIBLE_PROTOCOL_VERSION :
+                connection.error = MediaErr.BAD_SERVER;
+                break;
+            case ReturnCode.MISSING_REMOTECONNECTIONDESCRIPTOR :
+                connection.error = MediaErr.SERVICE_NOT_DEFINED;
+                break;
+            case ReturnCode.TRANSIENT_ERROR :
+                connection.error = MediaErr.NOT_SUPPORTED;
+                break;
             default:
-                try {
-                    connection.fsm.signal(ConnectionTransition.FAILURE);
-                } catch (UnknownTransitionException e) {
-                }
-                return true;
-        }
+                connection.error = MediaErr.UNKNOWN_ERROR;
+        }
+
+        // get error message
+        connection.errorMsg = resp.getReturnCode().getComment();
+
+        //signal to FSM
+        try {
+            connection.fsm.signal(ConnectionTransition.FAILURE);
+        } catch (UnknownTransitionException e) {
+        }
+        return true;
     }

 }
=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/DeleteConnectionRequest.java Mon Dec 6 04:04:45 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/DeleteConnectionRequest.java Tue Dec 7 01:45:47 2010
@@ -48,7 +48,8 @@
DeleteConnection req = new DeleteConnection(this, callId, endpointID, connectionID);
         req.setTransactionHandle(txHandle);

-//        new DeleteConnectionResponseHandler(txHandle);
+        new DeleteConnectionResponseHandler(txHandle, connection);
+        System.out.println("Sending DLCX!!!!");
         //send request
         connection.getSession().getDriver().send(req);
     }
=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/ModifyConnectionRequest.java Mon Dec 6 04:04:45 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/ModifyConnectionRequest.java Tue Dec 7 01:45:47 2010
@@ -49,7 +49,7 @@
ModifyConnection req = new ModifyConnection(this, callId, endpointID, connectionID);
         req.setTransactionHandle(txHandle);

-//        new ModifyConnectionResponseHandler(txHandle);
+        new ModifyConnectionResponseHandler(txHandle, connection);
         try {
req.setRemoteConnectionDescriptor(new ConnectionDescriptor(connection.sdpPortManager.remoteSdp));
         } catch (Exception e) {
=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/ModifyConnectionResponseHandler.java Mon Dec 6 04:04:45 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/ModifyConnectionResponseHandler.java Tue Dec 7 01:45:47 2010
@@ -57,19 +57,10 @@
                 return true;
             case ReturnCode.ENDPOINT_UNKNOWN :
                 return true;
-// fireEvent(SdpPortManagerEvent.NETWORK_STREAM_FAILURE, false, -// SdpPortManagerEvent.RESOURCE_UNAVAILABLE, resp.getReturnCode().getComment());
             case ReturnCode.CONNECTION_WAS_DELETED:
                 return true;
-//                connection.state = ConnectionState.CLOSED;
-// fireEvent(SdpPortManagerEvent.NETWORK_STREAM_FAILURE, false, -// SdpPortManagerEvent.RESOURCE_UNAVAILABLE, resp.getReturnCode().getComment());
             default:
                 return true;
-//                connection.state = ConnectionState.INVALID;
-// fireEvent(SdpPortManagerEvent.NETWORK_STREAM_FAILURE, false, -// SdpPortManagerEvent.RESOURCE_UNAVAILABLE, resp.getReturnCode().getComment());
-
         }
     }
 }
=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/NetworkConnectionImpl.java Mon Dec 6 04:04:45 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/NetworkConnectionImpl.java Tue Dec 7 01:45:47 2010
@@ -9,21 +9,21 @@
 import java.util.concurrent.CopyOnWriteArrayList;

 import javax.media.mscontrol.MediaConfig;
+import javax.media.mscontrol.MediaErr;
 import javax.media.mscontrol.MediaEvent;
 import javax.media.mscontrol.MediaEventListener;
 import javax.media.mscontrol.MediaObject;
 import javax.media.mscontrol.MsControlException;
 import javax.media.mscontrol.Parameter;
 import javax.media.mscontrol.Parameters;
-import javax.media.mscontrol.join.Joinable;
 import javax.media.mscontrol.networkconnection.NetworkConnection;
 import javax.media.mscontrol.networkconnection.SdpPortManager;
 import javax.media.mscontrol.networkconnection.SdpPortManagerEvent;
 import javax.media.mscontrol.resource.Action;
 import javax.media.mscontrol.resource.AllocationEventListener;

-import org.apache.log4j.Logger;
 import org.mobicents.fsm.FSM;
+import org.mobicents.fsm.UnknownTransitionException;
 import org.mobicents.javax.media.mscontrol.AbstractJoinableContainer;
 import org.mobicents.javax.media.mscontrol.MediaConfigImpl;
 import org.mobicents.javax.media.mscontrol.MediaSessionImpl;
@@ -46,11 +46,15 @@
     protected EndpointIdentifier endpointName;
     protected ConnectionIdentifier connectionID;

- protected CopyOnWriteArrayList<MediaEventListener<? extends MediaEvent<?>>> eventListenerList = new CopyOnWriteArrayList<MediaEventListener<? extends MediaEvent<?>>>(); + protected CopyOnWriteArrayList<MediaEventListener<? extends MediaEvent<?>>> listeners = + new CopyOnWriteArrayList<MediaEventListener<? extends MediaEvent<?>>>();

     //FSM processor
     protected FSM fsm;
- private static Logger logger = Logger.getLogger(NetworkConnectionImpl.class);
+
+    //last error occured
+    protected MediaErr error;
+    protected String errorMsg;

public NetworkConnectionImpl(MediaSessionImpl session, MediaConfigImpl config) throws MsControlException {
         super(session);
@@ -58,9 +62,9 @@

         //determine endpoint local name
//if local name specified in config use it else use default packet relay endpoint
-        String localName = config.getParameter(MEDIAOBJECT_ID) != null ?
-            config.getParameter(MEDIAOBJECT_ID) : PACKET_RELAY;
-
+//        String localName = config.getParameter(MEDIAOBJECT_ID) != null ?
+//            config.getParameter(MEDIAOBJECT_ID) : PACKET_RELAY;
+        String localName = PACKET_RELAY;
//domain name of the server is constructed using proprties from config
         String domainName = session.getDriver().getRemoteDomainName();

@@ -76,14 +80,15 @@
         maxJoinees = 1;
         sdpPortManager = new SdpPortManagerImpl(this);

-        this.initFSM();
+        this.init();
     }

-    private void initFSM() {
-        fsm = new FSM();
+    protected void init() {
+        fsm = new FSM(session.getDriver().getScheduler());
         fsm.createState(ConnectionState.NULL);
         fsm.createState(ConnectionState.OPENING);
         fsm.createState(ConnectionState.OPEN);
+        fsm.createState(ConnectionState.CANCELED);
         fsm.createState(ConnectionState.HALF_OPEN);
         fsm.createState(ConnectionState.MODIFYING);
         fsm.createState(ConnectionState.CLOSING).setOnEnter(
@@ -108,11 +113,13 @@
//******************************************************************/
         //transition from OPENING to OPEN
         fsm.createTransition(ConnectionTransition.OPENED,
-                ConnectionState.OPENING, ConnectionState.OPEN);
+                ConnectionState.OPENING, ConnectionState.OPEN).setHandler(
+ new SdpPortManagerEventImpl(sdpPortManager, SdpPortManagerEvent.ANSWER_GENERATED));

         //transition from OPENING to HALF_OPEN
         fsm.createTransition(ConnectionTransition.CREATED,
-                ConnectionState.OPENING, ConnectionState.HALF_OPEN);
+ ConnectionState.OPENING, ConnectionState.HALF_OPEN).setHandler( + new SdpPortManagerEventImpl(sdpPortManager, SdpPortManagerEvent.OFFER_GENERATED));

         //transition from OPENING to CANCELED
         fsm.createTransition(ConnectionTransition.CLOSE,
@@ -124,7 +131,8 @@

         //transition from OPENING to FAILED
         fsm.createTimeoutTransition(
-                ConnectionState.OPENING, ConnectionState.FAILED, 5000);
+ ConnectionState.OPENING, ConnectionState.FAILED, 5000).setHandler(
+                new TimeoutError(this));



@@ -155,7 +163,8 @@
         //transition to OPEN
         fsm.createTransition(
                 ConnectionTransition.OPENED,
-                ConnectionState.MODIFYING, ConnectionState.OPEN);
+ ConnectionState.MODIFYING, ConnectionState.OPEN).setHandler( + new SdpPortManagerEventImpl(sdpPortManager, SdpPortManagerEvent.ANSWER_PROCESSED));
         //transition to FAILED
         fsm.createTransition(
                 ConnectionTransition.FAILURE,
@@ -164,6 +173,10 @@
         fsm.createTransition(ConnectionTransition.CLOSE,
                 ConnectionState.MODIFYING, ConnectionState.CLOSING);

+        fsm.createTimeoutTransition(
+ ConnectionState.MODIFYING, ConnectionState.FAILED, 5000).setHandler(
+                new TimeoutError(this));
+
//******************************************************************/ // STATE CANCELED / //******************************************************************/
@@ -177,7 +190,7 @@

         //transition to CLOSING without signals
         fsm.createTimeoutTransition(
-                ConnectionState.CANCELED, ConnectionState.FAILED, 5000);
+                ConnectionState.CANCELED, ConnectionState.INVALID, 5000);
     }

     protected ConnectionIdentifier getConnectionID() {
@@ -246,26 +259,19 @@

     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.getNetConnList().remove(this);
+            fsm.signal(ConnectionTransition.CLOSE);
+        } catch (UnknownTransitionException e) {
+            e.printStackTrace();
+        }
     }

     public void setParameters(Parameters paramParameters) {
     }

- public void addListener(AllocationEventListener paramAllocationEventListener) {
-        // TODO Auto-generated method stub
+    public void addListener(AllocationEventListener listener) {
     }

- public void removeListener(AllocationEventListener paramAllocationEventListener) {
+    public void removeListener(AllocationEventListener listener) {
         // TODO Auto-generated method stub
     }

=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/SdpPortManagerEventImpl.java Mon Dec 6 04:04:45 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/SdpPortManagerEventImpl.java Tue Dec 7 01:45:47 2010
@@ -13,13 +13,11 @@
 /**
  *
  * @author amit.bhayani
- * @author okulikov
+ * @author kulikov
  */
public class SdpPortManagerEventImpl implements SdpPortManagerEvent, TransitionHandler, StateEventHandler {

     private SdpPortManagerImpl source = null;
-    private MediaErr error = MediaErr.NO_ERROR;
-    private String errorText = null;
     private EventType eventType = null;
     private boolean isSuccessful = false;

@@ -28,12 +26,6 @@
         this.eventType = eventType;
         this.isSuccessful = true;
     }
-
- public SdpPortManagerEventImpl(SdpPortManagerImpl source, EventType eventType,
-            boolean isSuccessful, MediaErr error, String errorText) {
-        this.error = error;
-        this.errorText = errorText;
-    }

     public byte[] getMediaServerSdp() {
         return source.localSdp.getBytes();
@@ -50,11 +42,11 @@
     }

     public MediaErr getError() {
-        return this.error;
+        return source.connection.error;
     }

     public String getErrorText() {
-        return this.errorText;
+        return source.connection.errorMsg;
     }

     public EventType getEventType() {
=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/SdpPortManagerImpl.java Mon Dec 6 04:04:45 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/SdpPortManagerImpl.java Tue Dec 7 01:45:47 2010
@@ -35,7 +35,7 @@
  */
 public class SdpPortManagerImpl implements SdpPortManager {

-    private NetworkConnectionImpl connection;
+    protected NetworkConnectionImpl connection;

     protected String localSdp;
     protected String remoteSdp;
@@ -72,6 +72,7 @@
     }

public void processSdpOffer(byte[] sdp) throws SdpPortManagerException {
+        this.remoteSdp = new String(sdp);
         try {
             connection.fsm.signal(ConnectionTransition.OPEN);
         } catch (UnknownTransitionException e) {
@@ -97,6 +98,7 @@
     }

public void processSdpAnswer(byte[] sdp) throws SdpPortManagerException {
+        this.remoteSdp = new String(sdp);
         try {
             connection.fsm.signal(ConnectionTransition.MODIFY);
         } catch (UnknownTransitionException e) {
=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/fsm/ConnectionState.java Mon Dec 6 04:04:45 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/networkconnection/fsm/ConnectionState.java Tue Dec 7 01:45:47 2010
@@ -24,7 +24,7 @@
  */
 public interface ConnectionState {
     public final static String NULL = "NULL";
-    public final static String OPENING = "OPEN";
+    public final static String OPENING = "OPENING";
     public final static String OPEN= "OPEN";
     public final static String HALF_OPEN = "HALF_OPEN";
     public final static String CANCELED = "CANCELED";
=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/spi/DriverImpl.java Tue Nov 30 08:24:58 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/spi/DriverImpl.java Tue Dec 7 01:45:47 2010
@@ -10,6 +10,8 @@
 import java.util.Properties;

 import java.util.TooManyListenersException;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
 import javax.media.mscontrol.MsControlException;
 import javax.media.mscontrol.MsControlFactory;
 import javax.media.mscontrol.spi.Driver;
@@ -41,12 +43,14 @@
     private int localPort;
     private int remotePort;

+ private ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor();
+
     private MsControlFactoryImpl factory;
-    private Logger logger = Logger.getLogger(DriverImpl.class);
+    private static Logger logger = Logger.getLogger(DriverImpl.class);

     static {
         DriverManager.registerDriver(new DriverImpl());
- System.out.println("Driver " + DRIVER_NAME + " registered with DriverManager"); + logger.info("Driver " + DRIVER_NAME + " registered with DriverManager");
     }

     public DriverImpl() {
@@ -70,14 +74,19 @@
         } catch (UnknownHostException e) {
         }

- logger.info("Initializing MGCP on " + bindAddress + ":" + localPort);
-
-        //create and bind MGCP stack
-        try {
-            mgcpStack = new JainMgcpStackImpl(bindAddress, localPort);
-            mgcpProvider = mgcpStack.createProvider();
-        } catch (Exception e) {
-            throw new MsControlException(e.getMessage());
+ boolean testMode = config.getProperty("driver.test.mode") != null && + Boolean.parseBoolean(config.getProperty("driver.test.mode"));
+
+        if (!testMode) {
+ logger.info("Initializing MGCP on " + bindAddress + ":" + localPort);
+
+            //create and bind MGCP stack
+            try {
+                mgcpStack = new JainMgcpStackImpl(bindAddress, localPort);
+                mgcpProvider = mgcpStack.createProvider();
+            } catch (Exception e) {
+                throw new MsControlException(e.getMessage());
+            }
         }

         callAgent = new NotifiedEntity("mscontrol", localHost, localPort);
@@ -86,6 +95,10 @@
         return factory;
     }

+    public ScheduledExecutorService getScheduler() {
+        return scheduler;
+    }
+
     public NotifiedEntity getCallAgent() {
         return callAgent;
     }
@@ -116,4 +129,8 @@
     public String getName() {
         return DRIVER_NAME;
     }
-}
+
+    public void shutdown() {
+        scheduler.shutdownNow();
+    }
+}
=======================================
--- /trunk/servers/media/jsr-309/core/src/test/java/org/mobicents/fsm/FSMTest.java Tue Nov 30 08:24:58 2010 +++ /trunk/servers/media/jsr-309/core/src/test/java/org/mobicents/fsm/FSMTest.java Tue Dec 7 01:45:47 2010
@@ -41,7 +41,7 @@

     @Before
     public void setUp() {
-        fsm = new FSM();
+        fsm = new FSM(scheduler);
     }

     @After
@@ -179,7 +179,7 @@
         fsm.setStart("start");
         fsm.setEnd("end");

-        scheduler.scheduleAtFixedRate(fsm, 0, 1, TimeUnit.SECONDS);
+//        scheduler.scheduleAtFixedRate(fsm, 0, 1, TimeUnit.SECONDS);
         fsm.signal("t1");

         try {

Reply via email to