dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3171: Fixed NPE when new settings for modem's memory location

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Sun, 27 Mar 2011 22:54:16 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 3171
committer: Saptarshi <sunbiz@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2011-03-28 00:52:30 +0200
message:
  Fixed NPE when new settings for modem's memory location
modified:
  dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/SmsService.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/SmsService.java'
--- dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/SmsService.java	2011-03-27 15:43:20 +0000
+++ dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/SmsService.java	2011-03-27 22:52:30 +0000
@@ -753,7 +753,7 @@
 
                     SerialModemGateway gateway = new SerialModemGateway( modemName, port, baudRate, manufacturer, model );
 
-                    if ( simMemLocation != null || !simMemLocation.equals( "-" ) )
+                    if ( simMemLocation != null && !simMemLocation.equals( "-" ) )
                     {
                         gateway.getATHandler().setStorageLocations( simMemLocation );
                     }