Revision: e66ac3db679e
Author:   [email protected] <[email protected]>
Date:     Thu Jul 12 08:19:12 2012
Log:      fixed NPE bug for address-range

http://code.google.com/p/smscgateway/source/detail?r=e66ac3db679e

Modified:
/core/slee/smpp-server-ra/ra/src/main/java/org/mobicents/smsc/slee/resources/smpp/server/SmppServerSessionImpl.java /core/slee/smpp-server-ra/ra/src/main/java/org/mobicents/smsc/slee/resources/smpp/server/SmppServerSessionsImpl.java /core/smpp/src/main/java/org/mobicents/smsc/smpp/DefaultSmppServerHandler.java

=======================================
--- /core/slee/smpp-server-ra/ra/src/main/java/org/mobicents/smsc/slee/resources/smpp/server/SmppServerSessionImpl.java Sat Jul 7 10:32:42 2012 +++ /core/slee/smpp-server-ra/ra/src/main/java/org/mobicents/smsc/slee/resources/smpp/server/SmppServerSessionImpl.java Thu Jul 12 08:19:12 2012
@@ -35,7 +35,12 @@
                this.wrappedSmppServerSession = wrappedSmppServerSession;
                this.smppServerResourceAdaptor = smppServerResourceAdaptor;

- this.pattern = Pattern.compile(this.wrappedSmppServerSession.getConfiguration().getAddressRange().getAddress()); + if (this.wrappedSmppServerSession.getConfiguration().getAddressRange().getAddress() != null) { + this.pattern = Pattern.compile(this.wrappedSmppServerSession.getConfiguration().getAddressRange()
+                                       .getAddress());
+               } else {
+                       this.pattern = null;
+               }
        }

        protected Pattern getAddressRangePattern() {
=======================================
--- /core/slee/smpp-server-ra/ra/src/main/java/org/mobicents/smsc/slee/resources/smpp/server/SmppServerSessionsImpl.java Thu Jul 12 06:18:52 2012 +++ /core/slee/smpp-server-ra/ra/src/main/java/org/mobicents/smsc/slee/resources/smpp/server/SmppServerSessionsImpl.java Thu Jul 12 08:19:12 2012
@@ -59,6 +59,9 @@

if (sessionBindType == SmppBindType.TRANSCEIVER || sessionBindType == SmppBindType.RECEIVER) {
                                Pattern p = 
smppServerSessionImpl.getAddressRangePattern();
+                               if(p == null){
+                                       continue;
+                               }
                                Matcher m = p.matcher(address);
                                if (m.matches()) {
                                        return smppServerSessionImpl;
=======================================
--- /core/smpp/src/main/java/org/mobicents/smsc/smpp/DefaultSmppServerHandler.java Wed Jul 11 08:29:09 2012 +++ /core/smpp/src/main/java/org/mobicents/smsc/smpp/DefaultSmppServerHandler.java Thu Jul 12 08:19:12 2012
@@ -106,8 +106,6 @@

                //TODO : we are checking with empty String, is this correct?

- System.err.println("bindRequestAddressRange.getAddress()="+bindRequestAddressRange.getAddress()+"=");
-
if (bindRequestAddressRange.getAddress() == null || bindRequestAddressRange.getAddress() == "") {
                        // If ESME doesn't know we set it up from our config
                        
bindRequestAddressRange.setAddress(esmeAddressRange.getAddress());

Reply via email to