From 0cc197de4eb16ba06f227aa8257944e81e4f4372 Mon Sep 17 00:00:00 2001
From: schinz <schinz@epfl.ch>
Date: Sun, 20 Mar 2005 16:54:10 +0000
Subject: - bug fix: increase the timeout while waiting f...

- bug fix: increase the timeout while waiting for the parents to be
computed
---
 sources/scala/runtime/types/ScalaClassType.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'sources')

diff --git a/sources/scala/runtime/types/ScalaClassType.java b/sources/scala/runtime/types/ScalaClassType.java
index 728ac1b582..c338f17079 100644
--- a/sources/scala/runtime/types/ScalaClassType.java
+++ b/sources/scala/runtime/types/ScalaClassType.java
@@ -167,6 +167,7 @@ public class ScalaClassType extends ClassType {
             } catch (InterruptedException e) {
                 throw new Error(e);
             }
+            timeout *= 2;
             if (timeout >= 1000)
                 throw new Error("computation of parents apparently stuck for "
                                 + this);
@@ -197,7 +198,7 @@ public class ScalaClassType extends ClassType {
                 dci++;
                 toAddParents = ancestorCode[dci++];
             }
-            int toAddSelf = (!constr.isTrivial) && (l == level) ? 1 : 0;
+            int toAddSelf = (l == level) && (!constr.isTrivial) ? 1 : 0;
             int toAdd = toAddParents + toAddSelf;
             ScalaClassType[] initialRow;
 
-- 
cgit v1.2.3