style: Simplifies code.
This commit is contained in:
parent
3e01bff25e
commit
99600368f6
@ -132,14 +132,11 @@ public class HostCandidateHarvester
|
|||||||
* Gets the list of explicitly allowed addresses.
|
* Gets the list of explicitly allowed addresses.
|
||||||
* @return the list of explicitly allowed addresses.
|
* @return the list of explicitly allowed addresses.
|
||||||
*/
|
*/
|
||||||
public static List<InetAddress> getAllowedAddresses()
|
public static synchronized List<InetAddress> getAllowedAddresses()
|
||||||
{
|
{
|
||||||
synchronized (HostCandidateHarvester.class)
|
if (!addressFiltersInitialized)
|
||||||
{
|
{
|
||||||
if (!addressFiltersInitialized)
|
initializeAddressFilters();
|
||||||
{
|
|
||||||
initializeAddressFilters();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return allowedAddresses;
|
return allowedAddresses;
|
||||||
@ -149,14 +146,11 @@ public class HostCandidateHarvester
|
|||||||
* Gets the list of blocked addresses.
|
* Gets the list of blocked addresses.
|
||||||
* @return the list of blocked addresses.
|
* @return the list of blocked addresses.
|
||||||
*/
|
*/
|
||||||
public static List<InetAddress> getBlockedAddresses()
|
public static synchronized List<InetAddress> getBlockedAddresses()
|
||||||
{
|
{
|
||||||
synchronized (HostCandidateHarvester.class)
|
if (!addressFiltersInitialized)
|
||||||
{
|
{
|
||||||
if (!addressFiltersInitialized)
|
initializeAddressFilters();
|
||||||
{
|
|
||||||
initializeAddressFilters();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return blockedAddresses;
|
return blockedAddresses;
|
||||||
@ -166,67 +160,63 @@ public class HostCandidateHarvester
|
|||||||
* Initializes the lists of allowed and blocked addresses according to the
|
* Initializes the lists of allowed and blocked addresses according to the
|
||||||
* configuration properties.
|
* configuration properties.
|
||||||
*/
|
*/
|
||||||
private static void initializeAddressFilters()
|
private static synchronized void initializeAddressFilters()
|
||||||
{
|
{
|
||||||
synchronized (HostCandidateHarvester.class)
|
if (addressFiltersInitialized)
|
||||||
|
return;
|
||||||
|
addressFiltersInitialized = true;
|
||||||
|
|
||||||
|
String[] allowedAddressesStr
|
||||||
|
= StackProperties.getStringArray(
|
||||||
|
StackProperties.ALLOWED_ADDRESSES, ";");
|
||||||
|
|
||||||
|
if (allowedAddressesStr != null)
|
||||||
{
|
{
|
||||||
if (addressFiltersInitialized)
|
for (String addressStr : allowedAddressesStr)
|
||||||
return;
|
|
||||||
|
|
||||||
String[] allowedAddressesStr
|
|
||||||
= StackProperties.getStringArray(
|
|
||||||
StackProperties.ALLOWED_ADDRESSES, ";");
|
|
||||||
|
|
||||||
if (allowedAddressesStr != null)
|
|
||||||
{
|
{
|
||||||
for (String addressStr : allowedAddressesStr)
|
InetAddress address;
|
||||||
|
try
|
||||||
{
|
{
|
||||||
InetAddress address;
|
address = InetAddress.getByName(addressStr);
|
||||||
try
|
}
|
||||||
{
|
catch (Exception e)
|
||||||
address = InetAddress.getByName(addressStr);
|
{
|
||||||
}
|
logger.warning("Failed to add an allowed address: "
|
||||||
catch (Exception e)
|
+ addressStr);
|
||||||
{
|
continue;
|
||||||
logger.warning("Failed to add an allowed address: "
|
|
||||||
+ addressStr);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (allowedAddresses == null)
|
|
||||||
allowedAddresses = new ArrayList<>();
|
|
||||||
|
|
||||||
allowedAddresses.add(address);
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
String[] blockedAddressesStr
|
if (allowedAddresses == null)
|
||||||
= StackProperties.getStringArray(
|
allowedAddresses = new ArrayList<>();
|
||||||
|
|
||||||
|
allowedAddresses.add(address);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
String[] blockedAddressesStr
|
||||||
|
= StackProperties.getStringArray(
|
||||||
StackProperties.BLOCKED_ADDRESSES, ";");
|
StackProperties.BLOCKED_ADDRESSES, ";");
|
||||||
if (blockedAddressesStr != null)
|
if (blockedAddressesStr != null)
|
||||||
|
{
|
||||||
|
for (String addressStr : blockedAddressesStr)
|
||||||
{
|
{
|
||||||
for (String addressStr : blockedAddressesStr)
|
InetAddress address;
|
||||||
|
try
|
||||||
{
|
{
|
||||||
InetAddress address;
|
address = InetAddress.getByName(addressStr);
|
||||||
try
|
}
|
||||||
{
|
catch (Exception e)
|
||||||
address = InetAddress.getByName(addressStr);
|
{
|
||||||
}
|
logger.warning("Failed to add a blocked address: "
|
||||||
catch (Exception e)
|
+ addressStr);
|
||||||
{
|
continue;
|
||||||
logger.warning("Failed to add a blocked address: "
|
|
||||||
+ addressStr);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (blockedAddresses == null)
|
|
||||||
blockedAddresses = new ArrayList<>();
|
|
||||||
|
|
||||||
blockedAddresses.add(address);
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
addressFiltersInitialized = true;
|
if (blockedAddresses == null)
|
||||||
|
blockedAddresses = new ArrayList<>();
|
||||||
|
|
||||||
|
blockedAddresses.add(address);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user