Revision: 15893
Author: [email protected]
Date: Mon Dec 20 08:55:47 2010
Log: Fix for Shell Server
http://code.google.com/p/mobicents/source/detail?r=15893

Modified:
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/ss7/MtpManagement.java

=======================================
--- /trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/ss7/MtpManagement.java Mon Dec 20 07:34:04 2010 +++ /trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/ss7/MtpManagement.java Mon Dec 20 08:55:47 2010
@@ -1,5 +1,6 @@
 package org.mobicents.media.server.impl.resource.ss7;

+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
@@ -8,6 +9,7 @@
 import java.util.concurrent.ConcurrentLinkedQueue;

 import javolution.text.TextBuilder;
+import javolution.util.FastMap;

 import org.apache.log4j.Logger;
 import org.mobicents.media.Server;
@@ -28,13 +30,14 @@
 import org.mobicents.protocols.ss7.management.shell.ShellCommand;
 import org.mobicents.protocols.ss7.mtp.oam.Linkset;
 import org.mobicents.protocols.ss7.mtp.oam.LinksetManager;
+import org.mobicents.protocols.ss7.mtp.oam.LinksetMode;
 import org.mobicents.protocols.ss7.mtp.oam.LinksetSelector;
 import org.mobicents.protocols.stream.api.SelectorKey;

 /**
  *
  * @author amit bhayani
- *
+ *
  */
 public class MtpManagement implements Task {

@@ -122,12 +125,39 @@

        public void start() throws Exception {

+               // Link Managemenet
+               linkSetSelector = new LinksetSelector();
+
                try {
                        linkSetManager.load();
-               } catch (Exception e) {
-                       // ignore?
-               }
-               System.out.println(linkSetManager.getLinksetFactories().size());
+                       FastMap<TextBuilder, Linkset> linksets = linkSetManager
+                                       .getLinksets();
+
+                       // If there are configured Linkset, lets add them to 
LinksetSelector
+ for (FastMap.Entry<TextBuilder, Linkset> e = linksets.head(), end = linksets
+                                       .tail(); (e = e.getNext()) != end;) {
+                               Linkset linkset = e.getValue();
+                               if (linkset.getMode() == 
LinksetMode.CONFIGURED) {
+                                       logger.info(String.format(
+                                                       "Linkset %s is configured 
and will be started", e
+                                                                       
.getKey().toString()));
+                                       try {
+                                               SelectorKey key = 
linkset.register(linkSetSelector);
+                                       } catch (IOException ex) {
+                                               logger.error(String.format(
+                                                               "Registration for %s 
LinkSet failed", e
+                                                                               
.getKey().toString()), ex);
+                                       }
+                               }
+                       }
+
+               } catch (FileNotFoundException fnfex) {
+                       logger
+                                       .warn(String
+                                                       .format(
+                                                                       "SS7 
configuration file not found. Reconfigure SS7 Linksets : %s",
+                                                                       
fnfex.getMessage()));
+               }

                Server.scheduler.start();

@@ -141,9 +171,6 @@
                cliServer.setCliCmdListener(shellCmdListenerImpl);
                cliServer.start();

-               // Link Managemenet
-               linkSetSelector = new LinksetSelector();
-
                // M3UA
                m3uaProvider = TcpProvider.open();
                selector = m3uaProvider.openSelector();
@@ -158,6 +185,7 @@
                this.isActive = true;

                task = Server.scheduler.execute(this);
+
        }

        public void stop() {
@@ -185,7 +213,7 @@
                                        SelectorKey key = 
linkset.register(linkSetSelector);
                                } catch (IOException e) {
                                        logger.error(String.format(
-                                                       "Registration for % LinkSet 
failed", linksetName
+                                                       "Registration for %s LinkSet 
failed", linksetName
                                                                        
.toString()), e);
                                }
                        }

Reply via email to