From e871903d41d9f19c966a52bf643ec2efab6f63f1 Mon Sep 17 00:00:00 2001 From: Benedict Elliott Smith Date: Tue, 22 Jan 2019 10:04:17 +0000 Subject: [PATCH] ninja: fix bad merge to 4.0 of CASSANDRA-14931 --- .../cassandra/distributed/LegacyAdapter.java | 42 ------------------- 1 file changed, 42 deletions(-) delete mode 100644 test/distributed/org/apache/cassandra/distributed/LegacyAdapter.java diff --git a/test/distributed/org/apache/cassandra/distributed/LegacyAdapter.java b/test/distributed/org/apache/cassandra/distributed/LegacyAdapter.java deleted file mode 100644 index 1ff88eda75..0000000000 --- a/test/distributed/org/apache/cassandra/distributed/LegacyAdapter.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.cassandra.distributed; - -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.locator.InetAddressAndPort; -import org.apache.cassandra.utils.FBUtilities; - -import java.net.InetAddress; - -public class LegacyAdapter -{ - private static final InetAddressAndPort broadcastAddressAndPort; - static - { - InetAddress address = FBUtilities.getBroadcastAddress(); - int port = DatabaseDescriptor.getStoragePort(); - broadcastAddressAndPort = InetAddressAndPort.getByAddressOverrideDefaults(address, port); - } - - public static InetAddressAndPort getBroadcastAddressAndPort() - { - return broadcastAddressAndPort; - } - -}