Merge branch 'master' of git.bitsofproof.com:supernode

Author: tamasblummer

api/generateBCSAPIkeys

@@ -15,7 +15,7 @@
  */
 package com.bitsofproof.supernode.common;
 
-import java.util.Arrays;
+import org.bouncycastle.util.Arrays;
 
 public class ByteVector
 {
@@ -30,7 +30,7 @@ public ByteVector (byte[] a)
 	public boolean equals (Object obj)
 	{
 		ByteVector other = (ByteVector) obj;
-		return Arrays.equals (bytes, other.bytes);
+		return Arrays.areEqual (bytes, other.bytes);
 	}
 
 	@Override

api/src/main/java/com/bitsofproof/supernode/common/ByteVector.java

@@ -31,14 +31,11 @@ public DiscoveryChain (List<Discovery> chain)
 	@Override
 	public List<InetSocketAddress> discover ()
 	{
+		ArrayList<InetSocketAddress> aggregate = new ArrayList<InetSocketAddress> ();
 		for ( Discovery discovery : discoveryChain )
 		{
-			List<InetSocketAddress> addresses = discovery.discover ();
-			if ( !addresses.isEmpty () )
-			{
-				return addresses;
-			}
+			aggregate.addAll (discovery.discover ());
 		}
-		return new ArrayList<InetSocketAddress> ();
+		return aggregate;
 	}
 }