| commit | 535fde45ab0d43c3843083113fb87c106549775f | [log] [tgz] |
|---|---|---|
| author | Chris Banes <chrisbanes@google.com> | Wed Feb 12 12:39:48 2014 +0000 |
| committer | Chris Banes <chrisbanes@google.com> | Wed Feb 12 12:39:48 2014 +0000 |
| tree | a93ce5aec7e5f528a10f881b5726d4267606e4f0 | |
| parent | e8362a5065acc3de05444a237cdd04deb0593eee [diff] |
Fix possible infinity loop in ag/417350 ag/417350 is a cherry pick of the merged CL ag/416106 which is why this is in klp-dev. I will cherry pick this into klp-docs after it has been merged. Change-Id: Ifcf1fc901acd73ad9ccfef789b73cd5a62a6302c
diff --git a/common/src/java/com/example/android/common/dummydata/Cheeses.java b/common/src/java/com/example/android/common/dummydata/Cheeses.java index 220d66a..783735c 100644 --- a/common/src/java/com/example/android/common/dummydata/Cheeses.java +++ b/common/src/java/com/example/android/common/dummydata/Cheeses.java
@@ -174,6 +174,9 @@ Random random = new Random(); HashSet<String> items = new HashSet<String>(); + // Make sure that don't infinity loop + count = Math.min(count, CHEESES.length); + while (items.size() < count) { items.add(CHEESES[random.nextInt(CHEESES.length)]); }