git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
JAL-1912 Double.NaN breaks JSON serialization - added check to prevent this
[jalview.git]
/
src
/
jalview
/
datamodel
/
AlignmentAnnotation.java
diff --git
a/src/jalview/datamodel/AlignmentAnnotation.java
b/src/jalview/datamodel/AlignmentAnnotation.java
index
bb45b67
..
9c3af27
100755
(executable)
--- a/
src/jalview/datamodel/AlignmentAnnotation.java
+++ b/
src/jalview/datamodel/AlignmentAnnotation.java
@@
-959,12
+959,8
@@
public class AlignmentAnnotation
public void adjustForAlignment()
{
- if (sequenceRef == null)
- {
- return;
- }
-
- if (annotations == null)
+ if (sequenceRef == null || sequenceMapping == null
+ || annotations == null)
{
return;
}