Changeset 2174

Timestamp:

07/03/08 12:32:51 (3 months ago)

Author:

nbeckman

Message:

[bugfix] Ticket 145, this should fix it. Disambiguator now stops if types don't disambiguate.

Files:

• trunk/ProjectFortress/src/com/sun/fortress/compiler/Disambiguator.java (modified) (1 diff)

trunk/ProjectFortress/src/com/sun/fortress/compiler/Disambiguator.java

@@ -150 +150 @@
-        }
-        
+        // Go no further if we couldn't disambiguate the types.
+        if( errors.size() > 0 ) {
+                return new ApiResult(new_apis, errors);
+        }
+        
-        // then, rebuild the indices
-        IndexBuilder.ApiResult rebuilt_indx = IndexBuilder.buildApis(new_apis, System.currentTimeMillis());