/*
 * Copyright 2014 Real Logic Ltd.
 *
 * Licensed 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 uk.co.real_logic.aeron.common.concurrent.ringbuffer;

import uk.co.real_logic.aeron.common.BitUtil;

/**
 * Layout description for the underlying buffer used by a {@link RingBuffer}. The buffer consists
 * of a ring of messages which is a power of 2 in size, followed by a trailer section containing state
 * information for the producers and consumers of the ring.
 */
public class RingBufferDescriptor
{
    /** Offset within the trailer for where the tail value is stored. */
    public static final int TAIL_COUNTER_OFFSET;

    /** Offset within the trailer for where the head value is stored. */
    public static final int HEAD_COUNTER_OFFSET;

    /** Offset within the trailer for where the head value is stored. */
    public static final int CORRELATION_COUNTER_OFFSET;

    /** Offset within the trailer for where the consumer heartbeat time value is stored. */
    public static final int CONSUMER_HEARTBEAT_OFFSET;

    /** Total length of the trailer in bytes. */
    public static final int TRAILER_LENGTH;

    static
    {
        int offset = 0;
        TAIL_COUNTER_OFFSET = offset;

        offset += BitUtil.CACHE_LINE_SIZE;
        HEAD_COUNTER_OFFSET = offset;

        offset += BitUtil.CACHE_LINE_SIZE;
        CORRELATION_COUNTER_OFFSET = offset;

        offset += BitUtil.CACHE_LINE_SIZE;
        CONSUMER_HEARTBEAT_OFFSET = offset;

        offset += BitUtil.CACHE_LINE_SIZE;
        TRAILER_LENGTH = offset;
    }

    /**
     * Check the the buffer capacity is the correct size.
     *
     * @param capacity to be checked.
     * @throws IllegalStateException if the buffer capacity is not a power of 2.
     */
    public static void checkCapacity(final int capacity)
    {
        if (capacity < 2 || 1 != Integer.bitCount(capacity))
        {
            final String msg = "Capacity must be a positive power of 2 + TRAILER_LENGTH: capacity=" + capacity;
            throw new IllegalStateException(msg);
        }
    }
}
@@ -2321,45 +2321,29 @@
 if (
-capacity %3C 2 %7C%7C 1 != Integer.bitCount
+!BitUtil.isPowerOfTwo
 (cap

Use common power of 2 check.