Changeset 156

Timestamp:

10/17/02 13:55:51 (21 years ago)

Author:

piso

Message:

getNextUndeleted(), getPreviousUndeleted(): avoid NPE.

File:

• trunk/j/src/org/armedbear/j/mail/Mailbox.java (modified) (3 diffs)

trunk/j/src/org/armedbear/j/mail/Mailbox.java

@@ -3 +3 @@
  *
  * Copyright (C) 2000-2002 Peter Graves
- * $Id: Mailbox.java,v 1.2 2002-10-11 01:42:37 piso Exp $
+ * $Id: Mailbox.java,v 1.3 2002-10-17 13:55:51 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -359 +359 @@
             }
         }
-        for (line = line.next(); line != null; line = line.next()) {
-            if (line instanceof MailboxLine) {
-                MailboxEntry maybe = ((MailboxLine)line).getMailboxEntry();
-                if (!maybe.isDeleted())
-                    return maybe;
+        if (line != null) {
+            for (line = line.next(); line != null; line = line.next()) {
+                if (line instanceof MailboxLine) {
+                    MailboxEntry maybe = ((MailboxLine)line).getMailboxEntry();
+                    if (!maybe.isDeleted())
+                        return maybe;
+                }
             }
         }
@@ -378 +380 @@
             }
         }
-        for (line = line.previous(); line != null; line = line.previous()) {
-            if (line instanceof MailboxLine) {
-                MailboxEntry maybe = ((MailboxLine)line).getMailboxEntry();
-                if (!maybe.isDeleted())
-                    return maybe;
+        if (line != null) {
+            for (line = line.previous(); line != null; line = line.previous()) {
+                if (line instanceof MailboxLine) {
+                    MailboxEntry maybe = ((MailboxLine)line).getMailboxEntry();
+                    if (!maybe.isDeleted())
+                        return maybe;
+                }
             }
         }