8145722: NullPointerException in javadoc

Thu, 14 Jan 2016 18:05:43 +0000

author
robm
date
Thu, 14 Jan 2016 18:05:43 +0000
changeset 3006
9731ab1f18ee
parent 3005
0353cf89ea96
child 3071
8969d6096fe1
child 3073
0ee1f3cdb4ba

8145722: NullPointerException in javadoc
Reviewed-by: jjg

src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java file | annotate | diff | comparison | revisions
     1.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java	Thu Jan 07 08:45:19 2016 +0000
     1.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java	Thu Jan 14 18:05:43 2016 +0000
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -250,7 +250,7 @@
    1.11          for (int i = 0; i < list.size(); i++) {
    1.12              Object key = getMemberKey(list.get(i));
    1.13              Map<ProgramElementDoc, String> memberLevelMap = memberNameMap.get(key);
    1.14 -            if (level.equals(memberLevelMap.get(list.get(i))))
    1.15 +            if (memberLevelMap != null && level.equals(memberLevelMap.get(list.get(i))))
    1.16                  memberLevelMap.remove(list.get(i));
    1.17          }
    1.18      }

mercurial