moparisthebest
/
k-9
mirror of https://github.com/moparisthebest/k-9
1
0
Fork 0
Code Issues Releases Wiki Activity

Get rid of two potential null pointer access warnings

This commit is contained in:
cketti 2011-01-19 00:57:12 +00:00
parent 365b106753
commit 14a20843e3
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/fsck/k9/controller/MessagingController.java
View File

@ -4698,7 +4698,7 @@ public class MessagingController implements Runnable
final KeyguardManager keyguardService = (KeyguardManager) context.getSystemService(Context.KEYGUARD_SERVICE);
try
{
if (message != null && message.getFrom() != null)
if (message.getFrom() != null)
{
Address[] fromAddrs = message.getFrom();
String from = fromAddrs.length > 0 ? fromAddrs[0].toFriendly().toString() : null;
@ -5146,7 +5146,7 @@ public class MessagingController implements Runnable
try
{
LocalStore localStore = account.getLocalStore();
localFolder= localStore.getFolder(remoteFolder.getName());
localFolder = localStore.getFolder(remoteFolder.getName());
localFolder.open(OpenMode.READ_WRITE);
account.setRingNotified(false);
@ -5178,7 +5178,10 @@ public class MessagingController implements Runnable
String errorMessage = "Push failed: " + rootMessage;
try
{
localFolder.setStatus(errorMessage);
// Oddly enough, using a local variable gets rid of a
// potential null pointer access warning with Eclipse.
LocalFolder folder = localFolder;
folder.setStatus(errorMessage);
}
catch (Exception se)
{