Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/src/share/classes/com/sun/mirror/util/SourceOrderDeclScanner.java	Mon Feb 15 20:06:11 2010 -0800
     1.2 +++ b/src/share/classes/com/sun/mirror/util/SourceOrderDeclScanner.java	Mon Feb 15 20:17:57 2010 -0800
     1.3 @@ -101,7 +101,11 @@
     1.4          }
     1.5          @SuppressWarnings("cast")
     1.6          private int compareEqualPosition(Declaration d1, Declaration d2) {
     1.7 -            assert d1.getPosition() == d2.getPosition();
     1.8 +            assert
     1.9 +                (d1.getPosition() == d2.getPosition()) || // Handles d1 == d2 == null
    1.10 +                (d1.getPosition().file().compareTo(d2.getPosition().file()) == 0 &&
    1.11 +                 d1.getPosition().line()   == d2.getPosition().line() &&
    1.12 +                 d1.getPosition().column() == d2.getPosition().column());
    1.13  
    1.14              DeclPartialOrder dpo1 = new DeclPartialOrder();
    1.15              DeclPartialOrder dpo2 = new DeclPartialOrder();