From: adash <adash>
Date: Wed, 6 Aug 2008 07:34:11 +0000 (+0000)
Subject: compile error fixes for new Barrier.java
X-Git-Tag: preEdgeChange~20
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7429e576ca095487f78760392bd1c074de66f3a5;p=IRC.git

compile error fixes for new Barrier.java
---

diff --git a/Robust/src/ClassLibrary/Barrier.java b/Robust/src/ClassLibrary/Barrier.java
index 2be5dc9e..35556326 100644
--- a/Robust/src/ClassLibrary/Barrier.java
+++ b/Robust/src/ClassLibrary/Barrier.java
@@ -6,25 +6,26 @@ public class BarrierServer extends Thread {
     }
     
     public run() {
+      int n;
 	atomic {
 	    n=numthreads;
 	}
 	ServerSocket ss=new ServerSocket(2000);
-	Socket ar[]=new Socket[numthreads];
-	for(int i=0;i<numthreads;i++) {
+	Socket ar[]=new Socket[n];
+	for(int i=0;i<n;i++) {
 	    ar[i]=ss.accept();
 	}
 	
 	while(true) {
-	    for(int j=0;j<numthreads;j++) {
+	    for(int j=0;j<n;j++) {
 		Socket s=ar[j];
 		byte b[]=new byte[1];
 		while(s.read(b)!=1)
 		    ;
 	    }
 	    byte b[]=new byte[1];
-	    b[0]='A';
-	    for(int j=0;j<numthreads;j++)
+	    b[0]= (byte) 'A';
+	    for(int j=0;j<n;j++)
 		ar[j].write(b);
 	}
     }
@@ -33,13 +34,13 @@ public class BarrierServer extends Thread {
 public class Barrier {
     Socket s;
     public Barrier(String name) {
-	s=new Socket(name, 2000);
+      s=new Socket(name, 2000);
     }
     
-    public static void enterBarrier(Barrier b) {
-	byte b[]=new byte[1];
-	s.write(b);
-	while(s.read(b)!=1)
-	    ;
+    public static void enterBarrier(Barrier barr) {
+      byte b[]=new byte[1];
+      s.write(b);
+      while(s.read(b)!=1)
+        ;
     }
-}
\ No newline at end of file
+}