Revision: 16396
Author: baranowb
Date: Thu Jan 13 01:44:38 2011
Log: [No log message]
http://code.google.com/p/mobicents/source/detail?r=16396

Modified:
/trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/spi/DriverImpl.java

=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/spi/DriverImpl.java Sat Jan 8 01:35:28 2011 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/spi/DriverImpl.java Thu Jan 13 01:44:38 2011
@@ -1,5 +1,6 @@
 package org.mobicents.javax.media.mscontrol.spi;

+import jain.protocol.ip.mgcp.DeleteProviderException;
 import jain.protocol.ip.mgcp.JainMgcpCommandEvent;
 import jain.protocol.ip.mgcp.JainMgcpEvent;
 import jain.protocol.ip.mgcp.JainMgcpListener;
@@ -51,7 +52,7 @@
     private int localPort;
     private int remotePort;

- private ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor();
+    private ScheduledExecutorService scheduler;

     private MsControlFactoryImpl factory;
     private Logger logger = Logger.getLogger(DriverImpl.class);
@@ -67,6 +68,7 @@
     }

     public DriverImpl() {
+
     }

public MsControlFactory getFactory(Properties config) throws MsControlException {
@@ -74,7 +76,7 @@
         if (factory != null) {
             return factory;
         }
-
+        scheduler = Executors.newSingleThreadScheduledExecutor();
         if (config == null) {
             config = new Properties();
             config.setProperty("mgcp.bind.address", "127.0.0.1");
@@ -82,6 +84,7 @@
             config.setProperty("mgcp.local.port", "2729");
             config.setProperty("mgcp.server.port", "2427");
         }
+
         //get the bind address and port
         localHost = config.getProperty("mgcp.bind.address");
         remoteHost = config.getProperty("mgcp.server.address");
@@ -202,9 +205,24 @@
         return DRIVER_NAME;
     }

-    public void shutdown() {
-        scheduler.shutdownNow();
-    }
+       public void shutdown() {
+               if (scheduler != null) {
+                       scheduler.shutdownNow();
+               }
+
+               scheduler = null;
+               if (mgcpProvider != null) {
+                       try {
+                               
mgcpProvider.getJainMgcpStack().deleteProvider(mgcpProvider);
+                       } catch (DeleteProviderException e) {
+                               // TODO Auto-generated catch block
+                               e.printStackTrace();
+                       }
+                       mgcpProvider = null;
+                       mgcpStack = null;
+               }
+               factory = null;
+       }

     public void processMgcpCommandEvent(JainMgcpCommandEvent evt) {
         //we are expecting two types of commands:

Reply via email to