[mobicents] r12088 committed - some more fixes.

[mobicents]

Revision: 12088
Author: baranowb
Date: Sun Jun  6 13:13:16 2010
Log: some more fixes.
http://code.google.com/p/mobicents/source/detail?r=12088
Modified:
  
/trunk/protocols/ss7/mtp/src/main/java/org/mobicents/protocols/ss7/mtp/Mtp2.java
  
/trunk/protocols/ss7/mtp/src/main/java/org/mobicents/protocols/ss7/mtp/Mtp3.java

=======================================
---  
/trunk/protocols/ss7/mtp/src/main/java/org/mobicents/protocols/ss7/mtp/Mtp2.java	 
Sun Jun  6 12:56:28 2010
+++  
/trunk/protocols/ss7/mtp/src/main/java/org/mobicents/protocols/ss7/mtp/Mtp2.java	 
Sun Jun  6 13:13:16 2010
@@ -281,24 +281,22 @@
     private static final Logger logger = Logger.getLogger(Mtp2.class);

     public Mtp2(Mtp3 mtp3, Mtp1 channel, int sls) {
-       this(mtp3.name + ":" + channel, sls, Utils._VALUE_NOT_SET);
+       this(mtp3.name + ":" + channel, sls);
         this.channel = channel;
         this.mtp3 = mtp3;
         channel.setLink(this);
     }

     public Mtp2(String name) {
-        this(name, Utils._VALUE_NOT_SET, Utils._VALUE_NOT_SET);
+        this(name, Utils._VALUE_NOT_SET);
     }

-    public Mtp2(String name, int sls) {
-        this(name, sls, Utils._VALUE_NOT_SET);
-    }
-
-    public Mtp2(String name, int sls, int subservice) {
+
+
+    public Mtp2(String name, int sls) {
         this.name = name;
         this.sls = sls;
-        this.subservice = subservice;
+
         // init HDLC
         hdlc.fasthdlc_precalc();
         hdlc.fasthdlc_init(rxState);
@@ -338,27 +336,6 @@
         return this.state;
     }

-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     *  
org.mobicents.media.server.impl.resource.ss7.factories.Mtp2#getSubService
-     * ()
-     */
-    public int getSubService() {
-
-        return this.subservice;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     *  
org.mobicents.media.server.impl.resource.ss7.factories.Mtp2#setSubService()
-     */
-    public void setSubService(int subservice) {
-        this.subservice = subservice;
-    }

     /**
      * Assigns layer 1 implementation.
@@ -371,7 +348,7 @@
     }

     public Mtp1 getChannel() {
-       return channel;
+       return channel;
     }

     public void setLayer3(Mtp2Listener layer3) {
=======================================
---  
/trunk/protocols/ss7/mtp/src/main/java/org/mobicents/protocols/ss7/mtp/Mtp3.java	 
Sun Jun  6 12:56:28 2010
+++  
/trunk/protocols/ss7/mtp/src/main/java/org/mobicents/protocols/ss7/mtp/Mtp3.java	 
Sun Jun  6 13:13:16 2010
@@ -333,9 +333,9 @@
        }

        private void restartTraffic(Mtp2 link) {
-        int subservice = link.getSubService();
+        //int subservice = link.getSubService();
         //if (subservice == -1) {
-        subservice = DEFAULT_SUB_SERVICE_TRA;
+               int subservice = DEFAULT_SUB_SERVICE_TRA;
         //}
         byte[] buffer = new byte[6];
         writeRoutingLabel(buffer, 0,0,0,dpc,opc);