Fix infinite loop bug

tshemsedinov · tshemsedinov · commit 3567565a13d5 · 2021-09-22T23:53:20.000+03:00
Closes: #2
diff --git a/JavaScript/9-exclusive.js b/JavaScript/9-exclusive.js
@@ -17,8 +17,8 @@ class Pool {
       item = this.items[this.current];
       free = this.free[this.current];
       this.current++;
+      if (this.current === this.size) this.current = 0;
     } while (!item || !free);
-    if (this.current === this.size) this.current = 0;
     return item;
   }
 
diff --git a/JavaScript/a-await.js b/JavaScript/a-await.js
@@ -23,8 +23,8 @@ class Pool {
       item = this.items[this.current];
       free = this.free[this.current];
       this.current++;
+      if (this.current === this.size) this.current = 0;
     } while (!item || !free);
-    if (this.current === this.size) this.current = 0;
     return item;
   }
 
@@ -62,10 +62,12 @@ class Pool {
 
 (async () => {
   const pool = new Pool();
-  pool.add({ item: 1 });
-  pool.add({ item: 2 });
-  const last = { item: 3 };
-  pool.add(last);
+  const item1 = { item: 1 }
+  pool.add(item1);
+  const item2 = { item: 2 }
+  pool.add(item2);
+  const item3 = { item: 3 };
+  pool.add(item3);
 
   const x1 = await pool.capture();
   console.log({ x1 });
@@ -84,7 +86,7 @@ class Pool {
     console.log({ x6 });
   });
 
-  pool.release(x2);
-  pool.release(x1);
-  pool.release(x3);
+  pool.release(item2);
+  pool.release(item1);
+  pool.release(item3);
 })();
diff --git a/JavaScript/b-timeout.js b/JavaScript/b-timeout.js
@@ -30,8 +30,8 @@ class Pool {
       item = this.items[this.current];
       free = this.free[this.current];
       this.current++;
+      if (this.current === this.size) this.current = 0;
     } while (!item || !free);
-    if (this.current === this.size) this.current = 0;
     return item;
   }
 
@@ -98,5 +98,5 @@ class Pool {
   pool.release(x1);
   setTimeout(() => {
     pool.release(x3);
-  }, 3000);
+  }, 6000);
 })();

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@ class Pool {`
`17`	`17`	`item = this.items[this.current];`
`18`	`18`	`free = this.free[this.current];`
`19`	`19`	`this.current++;`
	`20`	`+ if (this.current === this.size) this.current = 0;`
`20`	`21`	`} while (!item \|\| !free);`
`21`		`- if (this.current === this.size) this.current = 0;`
`22`	`22`	`return item;`
`23`	`23`	`}`
`24`	`24`