Merge remote-tracking branch 'origin/master' into weimer_logging_cleanup

taegeonum · Nov 25, 2013 · c17dd0b · c17dd0b
2 parents 0835f48 + 595da14
commit c17dd0b
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/wake/src/main/java/com/microsoft/wake/profiler/Vertex.java b/wake/src/main/java/com/microsoft/wake/profiler/Vertex.java
@@ -1,10 +1,8 @@
 package com.microsoft.wake.profiler;
 
 import java.util.Arrays;
-import java.util.Set;
 
 import com.microsoft.tang.types.ConstructorDef;
-import com.microsoft.tang.util.MonotonicHashSet;
 
 /**
  * A vertex in the object graph. There is no edge type, since that would be redundant.
@@ -22,7 +20,7 @@ public Vertex(T object, String name, ConstructorDef<T> constructorDef, Vertex<?>
  this.name = name;
  this.constructorDef = constructorDef;
  this.constructorArguments = constructorArguments;
- for(Vertex v : constructorArguments) {
+ for(Vertex<?> v : constructorArguments) {
  if(v == null) {
  throw new NullPointerException();
  }
@@ -34,7 +32,7 @@ public Vertex(T object, ConstructorDef<T> constructorDef, Vertex<?>[] constructo
  this.name = null;
  this.constructorDef = constructorDef;
  this.constructorArguments = constructorArguments;
- for(Vertex v : constructorArguments) {
+ for(Vertex<?> v : constructorArguments) {
  if(v == null) {
  throw new NullPointerException();
  }