aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/util/GroupedList.java
diff options
context:
space:
mode:
authorGravatar Janak Ramakrishnan <janakr@google.com>2015-05-12 15:55:58 +0000
committerGravatar Damien Martin-Guillerez <dmarting@google.com>2015-05-15 09:35:29 +0000
commit5da9a0e2db3005f251e9db4dd429af2397d94668 (patch)
tree91cd824798179a0abb25655738fe53da10d90a40 /src/main/java/com/google/devtools/build/lib/util/GroupedList.java
parenta7c9692dd14f0ee3e7a3b29f0602c2d8424b6bc8 (diff)
Add debugging for NPE in GroupedList#toSet.
-- MOS_MIGRATED_REVID=93417885
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/util/GroupedList.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/util/GroupedList.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/util/GroupedList.java b/src/main/java/com/google/devtools/build/lib/util/GroupedList.java
index 69ec97a62b..cac6a7a51d 100644
--- a/src/main/java/com/google/devtools/build/lib/util/GroupedList.java
+++ b/src/main/java/com/google/devtools/build/lib/util/GroupedList.java
@@ -227,7 +227,7 @@ public class GroupedList<T> implements Iterable<Iterable<T>> {
case 0:
return;
case 1:
- elements.add(Iterables.getOnlyElement(item));
+ elements.add(Preconditions.checkNotNull(Iterables.getOnlyElement(item), elements));
return;
default:
elements.add(ImmutableList.copyOf(item));
@@ -254,7 +254,7 @@ public class GroupedList<T> implements Iterable<Iterable<T>> {
* goes in a group of its own.
*/
public void add(E elt) {
- Preconditions.checkState(elements.add(elt), "%s %s", elt, this);
+ Preconditions.checkState(elements.add(Preconditions.checkNotNull(elt)), "%s %s", elt, this);
if (currentGroup == null) {
groupedList.add(elt);
} else {