Mercurial > hg > openjdk > jdk6 > langtools

changeset 75:2c47edcd4d60

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6926703: apt tests should run with assertions enabled Reviewed-by: jjg
author darcy
date Mon, 15 Feb 2010 20:17:57 -0800
parents f7bc75dcef2c
children 01d46ebbc95b
files src/share/classes/com/sun/mirror/util/SourceOrderDeclScanner.java
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/com/sun/mirror/util/SourceOrderDeclScanner.java	Mon Feb 22 21:37:13 2010 +0000
+++ b/src/share/classes/com/sun/mirror/util/SourceOrderDeclScanner.java	Mon Feb 15 20:17:57 2010 -0800
@@ -94,7 +94,11 @@
         }
         @SuppressWarnings("cast")
         private int compareEqualPosition(Declaration d1, Declaration d2) {
-            assert d1.getPosition() == d2.getPosition();
+            assert
+                (d1.getPosition() == d2.getPosition()) || // Handles d1 == d2 == null
+                (d1.getPosition().file().compareTo(d2.getPosition().file()) == 0 &&
+                 d1.getPosition().line()   == d2.getPosition().line() &&
+                 d1.getPosition().column() == d2.getPosition().column());
 
             DeclPartialOrder dpo1 = new DeclPartialOrder();
             DeclPartialOrder dpo2 = new DeclPartialOrder();