Merged seedpeer branch with master branch, cleanup

This commit is contained in:
Steve Myers 2014-10-12 14:56:52 -07:00
parent f8b9408514
commit bec9a68750
3 changed files with 15 additions and 30 deletions

View file

@ -119,14 +119,15 @@ class StaticSeedNodeAddressesProvider implements Provider<SeedNodeAddress.Static
String seedNodeFromConfig = BitSquareModule.properties.getProperty("defaultSeedNode");
// Set default
SeedNodeAddress.StaticSeedNodeAddresses seedNode = SeedNodeAddress.StaticSeedNodeAddresses.LOCALHOST;
// SeedNodeAddress.StaticSeedNodeAddresses seedNode = SeedNodeAddress.StaticSeedNodeAddresses.DIGITAL_OCEAN;
//SeedNodeAddress.StaticSeedNodeAddresses seedNode = SeedNodeAddress.StaticSeedNodeAddresses.LOCALHOST;
SeedNodeAddress.StaticSeedNodeAddresses seedNode = SeedNodeAddress.StaticSeedNodeAddresses.DIGITAL_OCEAN1;
// if defined in config we override the above
if (seedNodeFromConfig != null)
seedNode = seedNodeFromConfig.equals("localhost") ?
SeedNodeAddress.StaticSeedNodeAddresses.LOCALHOST :
SeedNodeAddress.StaticSeedNodeAddresses.DIGITAL_OCEAN;
// if (seedNodeFromConfig != null)
// seedNode = seedNodeFromConfig.equals("localhost") ?
// SeedNodeAddress.StaticSeedNodeAddresses.LOCALHOST :
// SeedNodeAddress.StaticSeedNodeAddresses.DIGITAL_OCEAN;
return seedNode;
}
}