Fix a "FindBug" in "EmailChecker"

diff --git a/src/org/cacert/gigi/util/EmailChecker.java b/src/org/cacert/gigi/util/EmailChecker.java
index 00c6738c24b7617a77aa5b829b407ca2e3fabfb2..f1e8c3672f6ba1e81b5eeab3037e9d87ac42b405 100644 (file)
--- a/src/org/cacert/gigi/util/EmailChecker.java
+++ b/src/org/cacert/gigi/util/EmailChecker.java
@@ -33,20 +33,21 @@ public class EmailChecker {
                                                                new InputStreamReader(s.getInputStream()));
                                                PrintWriter pw = new PrintWriter(s.getOutputStream())) {
                                        String line;
                                                                new InputStreamReader(s.getInputStream()));
                                                PrintWriter pw = new PrintWriter(s.getOutputStream())) {
                                        String line;

-                                       while ((line = br.readLine()).startsWith("220-")) {
+                                       while ((line = br.readLine()) != null
+                                                       && line.startsWith("220-")) {

                                        }
                                        }

-
-                                       if (!line.startsWith("220")) {
+                                       if (line == null || !line.startsWith("220")) {

                                                continue;
                                        }
 
                                        pw.print("HELO www.cacert.org\r\n");
                                        pw.flush();
 
                                                continue;
                                        }
 
                                        pw.print("HELO www.cacert.org\r\n");
                                        pw.flush();
 

-                                       while ((line = br.readLine()).startsWith("220")) {
+                                       while ((line = br.readLine()) != null
+                                                       && line.startsWith("220")) {

                                        }
 
                                        }
 

-                                       if (!line.startsWith("250")) {
+                                       if (line == null || !line.startsWith("250")) {

                                                continue;
                                        }
                                        pw.print("MAIL FROM: <returns@cacert.org>\r\n");
                                                continue;
                                        }
                                        pw.print("MAIL FROM: <returns@cacert.org>\r\n");


@@ -54,7 +55,7 @@ public class EmailChecker {
 
                                        line = br.readLine();
 
 
                                        line = br.readLine();
 

-                                       if (!line.startsWith("250")) {
+                                       if (line == null || !line.startsWith("250")) {

                                                continue;
                                        }
                                        pw.print("RCPT TO: <" + address + ">\r\n");
                                                continue;
                                        }
                                        pw.print("RCPT TO: <" + address + ">\r\n");


@@ -77,7 +78,7 @@ public class EmailChecker {
                                                e.printStackTrace();
                                        }
 
                                                e.printStackTrace();
                                        }
 

-                                       if (!line.startsWith("250")) {
+                                       if (line == null || !line.startsWith("250")) {

                                                return line;
                                        } else {
                                                return OK;
                                                return line;
                                        } else {
                                                return OK;