Resolve #523 8 Null check should be first.

johnmay · johnmay · commit b5e9bd5e7f2b · 2019-01-02T22:24:07.000Z
diff --git a/misc/extra/src/main/java/org/openscience/cdk/io/CrystClustReader.java b/misc/extra/src/main/java/org/openscience/cdk/io/CrystClustReader.java
@@ -215,7 +215,7 @@ private IChemFile readChemFile(IChemFile file) throws CDKException {
                     seq.addChemModel(model);
                 } else {
                     logger.debug("Format seems broken. Skipping these lines:");
-                    while (!line.startsWith("frame:") && input.ready() && line != null) {
+                    while (line != null && !line.startsWith("frame:") && input.ready()) {
                         line = input.readLine();
                         logger.debug(lineNumber++ + ": ", line);
                     }

Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ private IChemFile readChemFile(IChemFile file) throws CDKException {`
`215`	`215`	`seq.addChemModel(model);`
`216`	`216`	`} else {`
`217`	`217`	`logger.debug("Format seems broken. Skipping these lines:");`
`218`		`- while (!line.startsWith("frame:") && input.ready() && line != null) {`
	`218`	`+ while (line != null && !line.startsWith("frame:") && input.ready()) {`
`219`	`219`	`line = input.readLine();`
`220`	`220`	`logger.debug(lineNumber++ + ": ", line);`
`221`	`221`	`}`