Skip to content

Commit

Permalink
Merge pull request #179 from xiaoguichao/master
Browse files Browse the repository at this point in the history
Correct some spelling mistakes (mainly in comments)
  • Loading branch information
mikeb01 authored Nov 21, 2016
2 parents 946d62a + 60153be commit 2314a27
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 12 deletions.
2 changes: 1 addition & 1 deletion src/main/java/com/lmax/disruptor/RingBuffer.java
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ public int getBufferSize()
*
* @param requiredCapacity The capacity to check for.
* @return <tt>true</tt> If the specified <tt>requiredCapacity</tt> is available
* <tt>false</tt> if now.
* <tt>false</tt> if not.
*/
public boolean hasAvailableCapacity(int requiredCapacity)
{
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/lmax/disruptor/Sequencer.java
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public interface Sequencer extends Cursored, Sequenced
* in the Sequencer. The scan will range from nextSequence to availableSequence. If
* there are no available values <code>&gt;= nextSequence</code> the return value will be
* <code>nextSequence - 1</code>. To work correctly a consumer should pass a value that
* it 1 higher than the last sequence that was successfully processed.
* is 1 higher than the last sequence that was successfully processed.
*
* @param nextSequence The sequence to start scanning from.
* @param availableSequence The sequence to scan to.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* <p>
* <p>Tracks the event processor instance, the event handler instance, and sequence barrier which the stage is attached to.</p>
*
* @param T the type of the configured {@link EventHandler}
* @param <T> the type of the configured {@link EventHandler}
*/
class EventProcessorInfo<T> implements ConsumerInfo
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,7 @@
* EP1 - EventProcessor 1
*
* </pre>
*/

/**
*
* @author mikeb01
*/
public final class ThreeToOneSequencedBatchThroughputTest extends AbstractPerfTestDisruptor
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/lmax/disruptor/RingBufferTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -1240,13 +1240,13 @@ public void shouldAddAndRemoveSequences() throws Exception
}

@Test
public void shouldHandleResetToAndNotWrapUnecessarilySingleProducer() throws Exception
public void shouldHandleResetToAndNotWrapUnnecessarilySingleProducer() throws Exception
{
assertHandleResetAndNotWrap(RingBuffer.createSingleProducer(StubEvent.EVENT_FACTORY, 4));
}

@Test
public void shouldHandleResetToAndNotWrapUnecessarilyMultiProducer() throws Exception
public void shouldHandleResetToAndNotWrapUnnecessarilyMultiProducer() throws Exception
{
assertHandleResetAndNotWrap(RingBuffer.createMultiProducer(StubEvent.EVENT_FACTORY, 4));
}
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/com/lmax/disruptor/RingBufferWithMocksTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public void setUp()
}

@Test
public void shouldDelgateNextAndPublish()
public void shouldDelegateNextAndPublish()
{
final org.jmock.Sequence sequence = mockery.sequence("publication sequence");
mockery.checking(
Expand All @@ -55,7 +55,7 @@ public void shouldDelgateNextAndPublish()
}

@Test
public void shouldDelgateTryNextAndPublish() throws Exception
public void shouldDelegateTryNextAndPublish() throws Exception
{
final org.jmock.Sequence sequence = mockery.sequence("publication sequence");
mockery.checking(
Expand All @@ -75,7 +75,7 @@ public void shouldDelgateTryNextAndPublish() throws Exception
}

@Test
public void shouldDelgateNextNAndPublish() throws Exception
public void shouldDelegateNextNAndPublish() throws Exception
{
final org.jmock.Sequence sequence = mockery.sequence("publication sequence");
mockery.checking(
Expand All @@ -96,7 +96,7 @@ public void shouldDelgateNextNAndPublish() throws Exception
}

@Test
public void shouldDelgateTryNextNAndPublish() throws Exception
public void shouldDelegateTryNextNAndPublish() throws Exception
{
final org.jmock.Sequence sequence = mockery.sequence("publication sequence");
mockery.checking(
Expand Down

0 comments on commit 2314a27

Please sign in to comment.