Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Merge throws on previous line to appease both checkstyle 5.6 and 5.7 #1542

Merged
merged 1 commit into from

3 participants

@scop

See pull request #1538 for discussion.

@HornetQBot
Collaborator

Can one of the admins verify this patch by saying "ok to test"?

@clebertsuconic

ok to test

@clebertsuconic

add user to white list

@clebertsuconic

we have no problems on applying the checkstyle change you've made.. the issue is that the build was broken not because of the files itself.. something is wrong with that pom...

@clebertsuconic clebertsuconic merged commit a74c8b2 into from
@scop scop deleted the branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Feb 15, 2014
  1. @scop

    Merge throws on previous line to appease both checkstyle 5.6 and 5.7

    scop authored
    See pull request #1538 for discussion.
This page is out of date. Refresh to see the latest.
Showing with 62 additions and 124 deletions.
  1. +4 −8 hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientProducerImpl.java
  2. +2 −4 hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQMessageProducer.java
  3. +1 −2  hornetq-jms-server/src/main/java/org/hornetq/jms/server/impl/JMSServerManagerImpl.java
  4. +8 −16 hornetq-journal/src/main/java/org/hornetq/core/journal/impl/FileWrapperJournal.java
  5. +7 −14 hornetq-journal/src/main/java/org/hornetq/core/journal/impl/JournalBase.java
  6. +1 −2  hornetq-journal/src/main/java/org/hornetq/core/journal/impl/NIOSequentialFile.java
  7. +2 −4 hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/StompSession.java
  8. +1 −2  hornetq-rest/src/main/java/org/hornetq/rest/queue/AcknowledgedQueueConsumer.java
  9. +2 −4 hornetq-rest/src/main/java/org/hornetq/rest/queue/ConsumersResource.java
  10. +1 −2  hornetq-rest/src/main/java/org/hornetq/rest/queue/QueueDestinationsResource.java
  11. +1 −2  hornetq-rest/src/main/java/org/hornetq/rest/queue/QueueServiceManager.java
  12. +1 −2  hornetq-rest/src/main/java/org/hornetq/rest/queue/push/FilePushStore.java
  13. +1 −2  hornetq-rest/src/main/java/org/hornetq/rest/queue/push/HornetQPushStrategy.java
  14. +1 −2  hornetq-rest/src/main/java/org/hornetq/rest/topic/AcknowledgedSubscriptionResource.java
  15. +1 −2  hornetq-rest/src/main/java/org/hornetq/rest/topic/FileTopicPushStore.java
  16. +1 −2  hornetq-rest/src/main/java/org/hornetq/rest/topic/SubscriptionResource.java
  17. +1 −2  hornetq-rest/src/main/java/org/hornetq/rest/topic/SubscriptionsResource.java
  18. +1 −2  hornetq-rest/src/test/java/org/hornetq/rest/test/PersistentPushTopicConsumerTest.java
  19. +1 −2  hornetq-rest/src/test/java/org/hornetq/rest/test/SelectorTest.java
  20. +1 −2  hornetq-server/src/main/java/org/hornetq/core/paging/impl/PagingStoreImpl.java
  21. +1 −2  hornetq-server/src/main/java/org/hornetq/core/persistence/impl/journal/DescribeJournal.java
  22. +5 −10 hornetq-server/src/main/java/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java
  23. +4 −8 hornetq-server/src/main/java/org/hornetq/core/persistence/impl/nullpm/NullStorageManager.java
  24. +2 −4 hornetq-server/src/main/java/org/hornetq/core/replication/ReplicationManager.java
  25. +1 −2  hornetq-server/src/main/java/org/hornetq/core/server/cluster/ClusterManager.java
  26. +1 −2  hornetq-server/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java
  27. +1 −2  hornetq-server/src/test/java/org/hornetq/tests/util/ServiceTestBase.java
  28. +1 −2  tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java
  29. +1 −2  tests/integration-tests/src/test/java/org/hornetq/tests/integration/discovery/DiscoveryTest.java
  30. +2 −4 ...on-tests/src/test/java/org/hornetq/tests/integration/jms/connection/ConnectionFactorySerializationTest.java
  31. +1 −2  tests/integration-tests/src/test/java/org/hornetq/tests/util/JMSTestBase.java
  32. +1 −2  tests/integration-tests/src/test/java/org/hornetq/tests/util/NonSerializableFactory.java
  33. +1 −2  tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/FakePagingManager.java
  34. +1 −2  tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/NonSerializableFactory.java
View
12 hornetq-core-client/src/main/java/org/hornetq/core/client/impl/ClientProducerImpl.java
@@ -356,8 +356,7 @@ private void checkClosed() throws HornetQException
*/
private void
largeMessageSend(final boolean sendBlocking, final MessageInternal msgI,
- final ClientProducerCredits credits, SendAcknowledgementHandler handler)
- throws HornetQException
+ final ClientProducerCredits credits, SendAcknowledgementHandler handler) throws HornetQException
{
int headerSize = msgI.getHeadersAndPropertiesEncodeSize();
@@ -416,8 +415,7 @@ else if ((input = msgI.getBodyInputStream()) != null)
*/
private void
largeMessageSendServer(final boolean sendBlocking, final MessageInternal msgI,
- final ClientProducerCredits credits, SendAcknowledgementHandler handler)
- throws HornetQException
+ final ClientProducerCredits credits, SendAcknowledgementHandler handler) throws HornetQException
{
sendInitialLargeMessageHeader(msgI, credits);
@@ -482,8 +480,7 @@ else if ((input = msgI.getBodyInputStream()) != null)
*/
private void
largeMessageSendBuffered(final boolean sendBlocking, final MessageInternal msgI,
- final ClientProducerCredits credits, SendAcknowledgementHandler handler)
- throws HornetQException
+ final ClientProducerCredits credits, SendAcknowledgementHandler handler) throws HornetQException
{
msgI.getBodyBuffer().readerIndex(0);
largeMessageSendStreamed(sendBlocking, msgI, new HornetQBufferInputStream(msgI.getBodyBuffer()), credits,
@@ -499,8 +496,7 @@ else if ((input = msgI.getBodyInputStream()) != null)
*/
private void largeMessageSendStreamed(final boolean sendBlocking, final MessageInternal msgI,
final InputStream inputStreamParameter, final ClientProducerCredits credits,
- SendAcknowledgementHandler handler)
- throws HornetQException
+ SendAcknowledgementHandler handler) throws HornetQException
{
boolean lastPacket = false;
View
6 hornetq-jms-client/src/main/java/org/hornetq/jms/client/HornetQMessageProducer.java
@@ -238,8 +238,7 @@ public void send(Message message, int deliveryMode, int priority, long timeToLiv
}
@Override
- public void send(Destination destination, Message message, CompletionListener completionListener)
- throws JMSException
+ public void send(Destination destination, Message message, CompletionListener completionListener) throws JMSException
{
send(destination, message, defaultDeliveryMode, defaultPriority, defaultTimeToLive, completionListener);
}
@@ -274,8 +273,7 @@ public void publish(final Topic topic, final Message message) throws JMSExceptio
send(topic, message);
}
- public void publish(final Message message, final int deliveryMode, final int priority, final long timeToLive)
- throws JMSException
+ public void publish(final Message message, final int deliveryMode, final int priority, final long timeToLive) throws JMSException
{
send(message, deliveryMode, priority, timeToLive);
}
View
3  hornetq-jms-server/src/main/java/org/hornetq/jms/server/impl/JMSServerManagerImpl.java
@@ -338,8 +338,7 @@ public void deActivate()
}
}
- public void recoverJndiBindings(String name, PersistedType type)
- throws NamingException
+ public void recoverJndiBindings(String name, PersistedType type) throws NamingException
{
List<String> bindings = unRecoveredJndi.get(name);
if ((bindings != null) && (bindings.size() > 0))
View
24 hornetq-journal/src/main/java/org/hornetq/core/journal/impl/FileWrapperJournal.java
@@ -87,8 +87,7 @@ public boolean isStarted()
// ------------------------
@Override
- public void appendAddRecord(long id, byte recordType, EncodingSupport record, boolean sync, IOCompletion callback)
- throws Exception
+ public void appendAddRecord(long id, byte recordType, EncodingSupport record, boolean sync, IOCompletion callback) throws Exception
{
JournalInternalRecord addRecord = new JournalAddRecord(true, id, recordType, record);
@@ -98,8 +97,7 @@ public void appendAddRecord(long id, byte recordType, EncodingSupport record, bo
/**
* Write the record to the current file.
*/
- private void writeRecord(JournalInternalRecord encoder, final boolean sync, final IOCompletion callback)
- throws Exception
+ private void writeRecord(JournalInternalRecord encoder, final boolean sync, final IOCompletion callback) throws Exception
{
lockAppend.lock();
@@ -143,8 +141,7 @@ public void appendDeleteRecordTransactional(long txID, long id, EncodingSupport
}
@Override
- public void appendAddRecordTransactional(long txID, long id, byte recordType, EncodingSupport record)
- throws Exception
+ public void appendAddRecordTransactional(long txID, long id, byte recordType, EncodingSupport record) throws Exception
{
count(txID);
JournalInternalRecord addRecord = new JournalAddRecordTX(true, txID, id, recordType, record);
@@ -153,16 +150,14 @@ public void appendAddRecordTransactional(long txID, long id, byte recordType, En
@Override
public void
- appendUpdateRecord(long id, byte recordType, EncodingSupport record, boolean sync, IOCompletion callback)
- throws Exception
+ appendUpdateRecord(long id, byte recordType, EncodingSupport record, boolean sync, IOCompletion callback) throws Exception
{
JournalInternalRecord updateRecord = new JournalAddRecord(false, id, recordType, record);
writeRecord(updateRecord, sync, callback);
}
@Override
- public void appendUpdateRecordTransactional(long txID, long id, byte recordType, EncodingSupport record)
- throws Exception
+ public void appendUpdateRecordTransactional(long txID, long id, byte recordType, EncodingSupport record) throws Exception
{
count(txID);
JournalInternalRecord updateRecordTX = new JournalAddRecordTX(false, txID, id, recordType, record);
@@ -170,8 +165,7 @@ public void appendUpdateRecordTransactional(long txID, long id, byte recordType,
}
@Override
- public void appendCommitRecord(long txID, boolean sync, IOCompletion callback, boolean lineUpContext)
- throws Exception
+ public void appendCommitRecord(long txID, boolean sync, IOCompletion callback, boolean lineUpContext) throws Exception
{
JournalInternalRecord commitRecord = new JournalCompleteRecordTX(TX_RECORD_TYPE.COMMIT, txID, null);
AtomicInteger value = transactions.remove(Long.valueOf(txID));
@@ -184,8 +178,7 @@ public void appendCommitRecord(long txID, boolean sync, IOCompletion callback, b
}
@Override
- public void appendPrepareRecord(long txID, EncodingSupport transactionData, boolean sync, IOCompletion callback)
- throws Exception
+ public void appendPrepareRecord(long txID, EncodingSupport transactionData, boolean sync, IOCompletion callback) throws Exception
{
JournalInternalRecord prepareRecord = new JournalCompleteRecordTX(TX_RECORD_TYPE.PREPARE, txID, transactionData);
AtomicInteger value = transactions.get(Long.valueOf(txID));
@@ -241,8 +234,7 @@ public void lineUpContext(IOCompletion callback)
@Override
public JournalLoadInformation load(List<RecordInfo> committedRecords,
- List<PreparedTransactionInfo> preparedTransactions, TransactionFailureCallback transactionFailure)
- throws Exception
+ List<PreparedTransactionInfo> preparedTransactions, TransactionFailureCallback transactionFailure) throws Exception
{
throw new HornetQUnsupportedPacketException();
}
View
21 hornetq-journal/src/main/java/org/hornetq/core/journal/impl/JournalBase.java
@@ -43,11 +43,9 @@ public abstract void appendAddRecordTransactional(final long txID, final long id
public abstract void appendCommitRecord(final long txID, final boolean sync, final IOCompletion callback,
boolean lineUpContext) throws Exception;
- public abstract void appendDeleteRecord(final long id, final boolean sync, final IOCompletion callback)
- throws Exception;
+ public abstract void appendDeleteRecord(final long id, final boolean sync, final IOCompletion callback) throws Exception;
- public abstract void appendDeleteRecordTransactional(final long txID, final long id, final EncodingSupport record)
- throws Exception;
+ public abstract void appendDeleteRecordTransactional(final long txID, final long id, final EncodingSupport record) throws Exception;
public abstract void appendPrepareRecord(final long txID, final EncodingSupport transactionData, final boolean sync,
final IOCompletion callback) throws Exception;
@@ -58,8 +56,7 @@ public abstract void appendUpdateRecord(final long id, final byte recordType, fi
public abstract void appendUpdateRecordTransactional(final long txID, final long id, final byte recordType,
final EncodingSupport record) throws Exception;
- public abstract void appendRollbackRecord(final long txID, final boolean sync, final IOCompletion callback)
- throws Exception;
+ public abstract void appendRollbackRecord(final long txID, final boolean sync, final IOCompletion callback) throws Exception;
public void appendAddRecord(long id, byte recordType, byte[] record, boolean sync) throws Exception
@@ -96,8 +93,7 @@ public void appendCommitRecord(final long txID, final boolean sync, final IOComp
appendCommitRecord(txID, sync, callback, true);
}
- public void appendUpdateRecord(final long id, final byte recordType, final byte[] record, final boolean sync)
- throws Exception
+ public void appendUpdateRecord(final long id, final byte recordType, final byte[] record, final boolean sync) throws Exception
{
appendUpdateRecord(id, recordType, new ByteArrayEncoding(record), sync);
}
@@ -108,8 +104,7 @@ public void appendUpdateRecordTransactional(final long txID, final long id, fina
appendUpdateRecordTransactional(txID, id, recordType, new ByteArrayEncoding(record));
}
- public void appendAddRecordTransactional(final long txID, final long id, final byte recordType, final byte[] record)
- throws Exception
+ public void appendAddRecordTransactional(final long txID, final long id, final byte recordType, final byte[] record) throws Exception
{
appendAddRecordTransactional(txID, id, recordType, new ByteArrayEncoding(record));
}
@@ -124,8 +119,7 @@ public void appendPrepareRecord(final long txID, final byte[] transactionData, f
appendPrepareRecord(txID, new ByteArrayEncoding(transactionData), sync);
}
- public void appendPrepareRecord(final long txID, final EncodingSupport transactionData, final boolean sync)
- throws Exception
+ public void appendPrepareRecord(final long txID, final EncodingSupport transactionData, final boolean sync) throws Exception
{
SyncIOCompletion syncCompletion = getSyncCallback(sync);
@@ -143,8 +137,7 @@ public void appendDeleteRecordTransactional(final long txID, final long id, fina
}
public void
- appendUpdateRecord(final long id, final byte recordType, final EncodingSupport record, final boolean sync)
- throws Exception
+ appendUpdateRecord(final long id, final byte recordType, final EncodingSupport record, final boolean sync) throws Exception
{
SyncIOCompletion callback = getSyncCallback(sync);
View
3  hornetq-journal/src/main/java/org/hornetq/core/journal/impl/NIOSequentialFile.java
@@ -326,8 +326,7 @@ protected ByteBuffer newBuffer(int size, final int limit)
return super.newBuffer(size, limit);
}
- private void internalWrite(final ByteBuffer bytes, final boolean sync, final IOAsyncTask callback)
- throws IOException, HornetQIOErrorException, InterruptedException
+ private void internalWrite(final ByteBuffer bytes, final boolean sync, final IOAsyncTask callback) throws IOException, HornetQIOErrorException, InterruptedException
{
if (!isOpen())
{
View
6 hornetq-protocols/hornetq-stomp-protocol/src/main/java/org/hornetq/core/protocol/stomp/StompSession.java
@@ -366,14 +366,12 @@ public void setNoLocal(boolean noLocal)
this.noLocal = noLocal;
}
- public void sendInternal(ServerMessageImpl message, boolean direct)
- throws Exception
+ public void sendInternal(ServerMessageImpl message, boolean direct) throws Exception
{
session.send(message, direct);
}
- public void sendInternalLarge(ServerMessageImpl message, boolean direct)
- throws Exception
+ public void sendInternalLarge(ServerMessageImpl message, boolean direct) throws Exception
{
int headerSize = message.getHeadersAndPropertiesEncodeSize();
if (headerSize >= connection.getMinLargeMessageSize())
View
3  hornetq-rest/src/main/java/org/hornetq/rest/queue/AcknowledgedQueueConsumer.java
@@ -44,8 +44,7 @@
protected String startup = Long.toString(System.currentTimeMillis());
protected volatile Acknowledgement ack;
- public AcknowledgedQueueConsumer(ClientSessionFactory factory, String destination, String id, DestinationServiceManager serviceManager, String selector)
- throws HornetQException
+ public AcknowledgedQueueConsumer(ClientSessionFactory factory, String destination, String id, DestinationServiceManager serviceManager, String selector) throws HornetQException
{
super(factory, destination, id, serviceManager, selector);
autoAck = false;
View
6 hornetq-rest/src/main/java/org/hornetq/rest/queue/ConsumersResource.java
@@ -192,8 +192,7 @@ protected void addConsumer(QueueConsumer consumer)
serviceManager.getTimeoutTask().add(this, consumer.getId());
}
- public QueueConsumer createConsumer(String selector)
- throws HornetQException
+ public QueueConsumer createConsumer(String selector) throws HornetQException
{
String genId = sessionCounter.getAndIncrement() + "-queue-" + destination + "-" + startup;
QueueConsumer consumer = new QueueConsumer(sessionFactory, destination, genId, serviceManager, selector);
@@ -201,8 +200,7 @@ public QueueConsumer createConsumer(String selector)
return consumer;
}
- public QueueConsumer createAcknowledgedConsumer(String selector)
- throws HornetQException
+ public QueueConsumer createAcknowledgedConsumer(String selector) throws HornetQException
{
String genId = sessionCounter.getAndIncrement() + "-queue-" + destination + "-" + startup;
QueueConsumer consumer = new AcknowledgedQueueConsumer(sessionFactory, destination, genId, serviceManager, selector);
View
3  hornetq-rest/src/main/java/org/hornetq/rest/queue/QueueDestinationsResource.java
@@ -153,8 +153,7 @@ public synchronized QueueResource findQueue(@PathParam("queue-name") String name
return queue;
}
- public QueueResource createQueueResource(String queueName, boolean defaultDurable, int timeoutSeconds, boolean duplicates)
- throws Exception
+ public QueueResource createQueueResource(String queueName, boolean defaultDurable, int timeoutSeconds, boolean duplicates) throws Exception
{
QueueResource queueResource = new QueueResource();
queueResource.setQueueDestinationsResource(this);
View
3  hornetq-rest/src/main/java/org/hornetq/rest/queue/QueueServiceManager.java
@@ -80,8 +80,7 @@ public void start() throws Exception
}
}
- public void deploy(QueueDeployment queueDeployment)
- throws Exception
+ public void deploy(QueueDeployment queueDeployment) throws Exception
{
if (!started)
{
View
3  hornetq-rest/src/main/java/org/hornetq/rest/queue/push/FilePushStore.java
@@ -86,8 +86,7 @@ public synchronized void update(PushRegistration reg) throws Exception
save(reg);
}
- protected void save(PushRegistration reg)
- throws JAXBException
+ protected void save(PushRegistration reg) throws JAXBException
{
Marshaller marshaller = ctx.createMarshaller();
marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
View
3  hornetq-rest/src/main/java/org/hornetq/rest/queue/push/HornetQPushStrategy.java
@@ -34,8 +34,7 @@ public void start() throws Exception
// initialize();
}
- protected void initialize()
- throws Exception
+ protected void initialize() throws Exception
{
super.start();
initialized = true;
View
3  hornetq-rest/src/main/java/org/hornetq/rest/topic/AcknowledgedSubscriptionResource.java
@@ -27,8 +27,7 @@
private long timeout;
private boolean deleteWhenIdle;
- public AcknowledgedSubscriptionResource(ClientSessionFactory factory, String destination, String id, DestinationServiceManager serviceManager, String selector, boolean durable, Long timeout)
- throws HornetQException
+ public AcknowledgedSubscriptionResource(ClientSessionFactory factory, String destination, String id, DestinationServiceManager serviceManager, String selector, boolean durable, Long timeout) throws HornetQException
{
super(factory, destination, id, serviceManager, selector);
this.timeout = timeout;
View
3  hornetq-rest/src/main/java/org/hornetq/rest/topic/FileTopicPushStore.java
@@ -24,8 +24,7 @@
*/
public class FileTopicPushStore extends FilePushStore implements TopicPushStore
{
- public FileTopicPushStore(String dirname)
- throws Exception
+ public FileTopicPushStore(String dirname) throws Exception
{
super(dirname);
}
View
3  hornetq-rest/src/main/java/org/hornetq/rest/topic/SubscriptionResource.java
@@ -27,8 +27,7 @@
protected long timeout;
private boolean deleteWhenIdle;
- public SubscriptionResource(ClientSessionFactory factory, String destination, String id, DestinationServiceManager serviceManager, String selector, boolean durable, long timeout)
- throws HornetQException
+ public SubscriptionResource(ClientSessionFactory factory, String destination, String id, DestinationServiceManager serviceManager, String selector, boolean durable, long timeout) throws HornetQException
{
super(factory, destination, id, serviceManager, selector);
this.durable = durable;
View
3  hornetq-rest/src/main/java/org/hornetq/rest/topic/SubscriptionsResource.java
@@ -264,8 +264,7 @@ public Response createSubscription(@FormParam("durable") @DefaultValue("false")
}
}
- protected QueueConsumer createConsumer(boolean durable, boolean autoAck, String subscriptionName, String selector, long timeout, boolean deleteWhenIdle)
- throws HornetQException
+ protected QueueConsumer createConsumer(boolean durable, boolean autoAck, String subscriptionName, String selector, long timeout, boolean deleteWhenIdle) throws HornetQException
{
QueueConsumer consumer;
if (autoAck)
View
3  hornetq-rest/src/test/java/org/hornetq/rest/test/PersistentPushTopicConsumerTest.java
@@ -244,8 +244,7 @@ public void postTwo(String msg)
}
}
- private void deployTopic(String topicName)
- throws Exception
+ private void deployTopic(String topicName) throws Exception
{
TopicDeployment deployment = new TopicDeployment();
deployment.setDuplicatesAllowed(true);
View
3  hornetq-rest/src/test/java/org/hornetq/rest/test/SelectorTest.java
@@ -319,8 +319,7 @@ public void testPull() throws Exception
}
}
- private Link consumeOrder(Order order, Link consumeNext)
- throws Exception
+ private Link consumeOrder(Order order, Link consumeNext) throws Exception
{
ClientResponse<?> response = consumeNext.request().header("Accept-Wait", "4").accept("application/xml").post(String.class);
Assert.assertEquals(200, response.getStatus());
View
3  hornetq-server/src/main/java/org/hornetq/core/paging/impl/PagingStoreImpl.java
@@ -806,8 +806,7 @@ else if (addressFullMessagePolicy == AddressFullMessagePolicy.DROP || addressFul
@Override
public boolean
- page(ServerMessage message, final Transaction tx, RouteContextList listCtx, final ReadLock managerLock)
- throws Exception
+ page(ServerMessage message, final Transaction tx, RouteContextList listCtx, final ReadLock managerLock) throws Exception
{
if (!running)
View
3  hornetq-server/src/main/java/org/hornetq/core/persistence/impl/journal/DescribeJournal.java
@@ -152,8 +152,7 @@ public void onReadRollbackRecord(final long transactionID) throws Exception
out.println("operation@Rollback;txID=" + transactionID);
}
- public void onReadPrepareRecord(final long transactionID, final byte[] extraData, final int numberOfRecords)
- throws Exception
+ public void onReadPrepareRecord(final long transactionID, final byte[] extraData, final int numberOfRecords) throws Exception
{
out.println("operation@Prepare,txID=" + transactionID + ",numberOfRecords=" + numberOfRecords +
",extraData=" + encode(extraData) + ", xid=" + toXid(extraData));
View
15 hornetq-server/src/main/java/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java
@@ -546,8 +546,7 @@ private void performCachedLargeMessageDeletes()
* @param pageFilesToSync
* @throws Exception
*/
- private void sendPagesToBackup(Map<SimpleString, Collection<Integer>> pageFilesToSync, PagingManager manager)
- throws Exception
+ private void sendPagesToBackup(Map<SimpleString, Collection<Integer>> pageFilesToSync, PagingManager manager) throws Exception
{
for (Entry<SimpleString, Collection<Integer>> entry : pageFilesToSync.entrySet())
{
@@ -563,8 +562,7 @@ private void sendPagesToBackup(Map<SimpleString, Collection<Integer>> pageFilesT
* @return
* @throws Exception
*/
- private Map<SimpleString, Collection<Integer>> getPageInformationForSync(PagingManager pagingManager)
- throws Exception
+ private Map<SimpleString, Collection<Integer>> getPageInformationForSync(PagingManager pagingManager) throws Exception
{
Map<SimpleString, Collection<Integer>> info = new HashMap<SimpleString, Collection<Integer>>();
for (SimpleString storeName : pagingManager.getStoreNames())
@@ -1093,8 +1091,7 @@ public void storePageTransaction(final long txID, final PageTransactionInfo page
}
}
- public void updatePageTransaction(final long txID, final PageTransactionInfo pageTransaction, final int depages)
- throws Exception
+ public void updatePageTransaction(final long txID, final PageTransactionInfo pageTransaction, final int depages) throws Exception
{
readLock();
try
@@ -1140,8 +1137,7 @@ public void storeReferenceTransactional(final long txID, final long queueID, fin
}
}
- public void storeAcknowledgeTransactional(final long txID, final long queueID, final long messageID)
- throws Exception
+ public void storeAcknowledgeTransactional(final long txID, final long queueID, final long messageID) throws Exception
{
readLock();
try
@@ -3793,8 +3789,7 @@ protected static PersistentQueueBindingEncoding newBindingEncoding(long id, Horn
@Override
public boolean
- addToPage(PagingStore store, ServerMessage msg, Transaction tx, RouteContextList listCtx)
- throws Exception
+ addToPage(PagingStore store, ServerMessage msg, Transaction tx, RouteContextList listCtx) throws Exception
{
/**
* Exposing the read-lock here is an encapsulation violation done in order to keep the code
View
12 hornetq-server/src/main/java/org/hornetq/core/persistence/impl/nullpm/NullStorageManager.java
@@ -173,8 +173,7 @@ public void storeAcknowledge(final long queueID, final long messageID) throws Ex
}
@Override
- public void storeAcknowledgeTransactional(final long txID, final long queueID, final long messageiD)
- throws Exception
+ public void storeAcknowledgeTransactional(final long txID, final long queueID, final long messageiD) throws Exception
{
}
@@ -439,8 +438,7 @@ public void deletePageTransactional(final long recordID) throws Exception
@Override
public void
- updatePageTransaction(final long txID, final PageTransactionInfo pageTransaction, final int depage)
- throws Exception
+ updatePageTransaction(final long txID, final PageTransactionInfo pageTransaction, final int depage) throws Exception
{
}
@@ -527,8 +525,7 @@ public void lineUpContext()
@Override
public void
- confirmPendingLargeMessageTX(final Transaction transaction, final long messageID, final long recordID)
- throws Exception
+ confirmPendingLargeMessageTX(final Transaction transaction, final long messageID, final long recordID) throws Exception
{
}
@@ -562,8 +559,7 @@ public void startReplication(final ReplicationManager replicationManager, final
}
@Override
- public boolean addToPage(PagingStore s, ServerMessage msg, Transaction tx, RouteContextList listCtx)
- throws Exception
+ public boolean addToPage(PagingStore s, ServerMessage msg, Transaction tx, RouteContextList listCtx) throws Exception
{
return false;
}
View
6 hornetq-server/src/main/java/org/hornetq/core/replication/ReplicationManager.java
@@ -164,8 +164,7 @@ public void appendDeleteRecord(final byte journalID, final long id) throws Excep
}
}
- public void appendCommitRecord(final byte journalID, final long txID, boolean sync, final boolean lineUp)
- throws Exception
+ public void appendCommitRecord(final byte journalID, final long txID, boolean sync, final boolean lineUp) throws Exception
{
if (enabled)
{
@@ -193,8 +192,7 @@ public void appendDeleteRecordTransactional(final byte journalID, final long txI
}
public void
- appendPrepareRecord(final byte journalID, final long txID, final EncodingSupport transactionData)
- throws Exception
+ appendPrepareRecord(final byte journalID, final long txID, final EncodingSupport transactionData) throws Exception
{
if (enabled)
{
View
3  hornetq-server/src/main/java/org/hornetq/core/server/cluster/ClusterManager.java
@@ -382,8 +382,7 @@ public ClusterConnection getClusterConnection(final String name)
* @throws HornetQException
*/
public void
- announceReplicatingBackupToLive(final Channel liveChannel, final boolean attemptingFailBack)
- throws HornetQException
+ announceReplicatingBackupToLive(final Channel liveChannel, final boolean attemptingFailBack) throws HornetQException
{
ClusterConnectionConfiguration config = ConfigurationUtils.getReplicationClusterConfiguration(configuration);
if (config == null)
View
3  hornetq-server/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java
@@ -2886,8 +2886,7 @@ public Object run()
@Override
public void startReplication(CoreRemotingConnection rc, final ClusterConnection clusterConnection,
- final Pair<TransportConfiguration, TransportConfiguration> pair, final boolean isFailBackRequest)
- throws HornetQException
+ final Pair<TransportConfiguration, TransportConfiguration> pair, final boolean isFailBackRequest) throws HornetQException
{
if (replicationManager != null)
{
View
3  hornetq-server/src/test/java/org/hornetq/tests/util/ServiceTestBase.java
@@ -862,8 +862,7 @@ protected void assertMessageBody(final int i, final ClientMessage message)
}
protected final void
- receiveMessages(ClientConsumer consumer, final int start, final int msgCount, final boolean ack)
- throws HornetQException
+ receiveMessages(ClientConsumer consumer, final int start, final int msgCount, final boolean ack) throws HornetQException
{
for (int i = start; i < msgCount; i++)
{
View
3  tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java
@@ -254,8 +254,7 @@ public void tearDown() throws Exception
}
protected final ClientSessionFactoryInternal
- createSessionFactoryAndWaitForTopology(ServerLocator locator, int topologyMembers)
- throws Exception
+ createSessionFactoryAndWaitForTopology(ServerLocator locator, int topologyMembers) throws Exception
{
CountDownLatch countDownLatch = new CountDownLatch(topologyMembers);
View
3  tests/integration-tests/src/test/java/org/hornetq/tests/integration/discovery/DiscoveryTest.java
@@ -889,8 +889,7 @@ private static void verifyBroadcast(BroadcastGroup broadcastGroup, DiscoveryGrou
* @param discoveryGroup
* @throws Exception
*/
- private static void verifyNonBroadcast(BroadcastGroup broadcastGroup, DiscoveryGroup discoveryGroup)
- throws Exception
+ private static void verifyNonBroadcast(BroadcastGroup broadcastGroup, DiscoveryGroup discoveryGroup) throws Exception
{
broadcastGroup.broadcastConnectors();
Assert.assertFalse("NO broadcast received", discoveryGroup.waitForBroadcast(2000));
View
6 ...tests/src/test/java/org/hornetq/tests/integration/jms/connection/ConnectionFactorySerializationTest.java
@@ -92,8 +92,7 @@ public void testNullLocalBindAddress() throws Exception
Assert.assertEquals(null, ((UDPBroadcastGroupConfiguration) y.getDiscoveryGroupConfiguration().getBroadcastEndpointFactoryConfiguration()).getLocalBindAddress());
}
- private static <T extends Serializable> byte[] serialize(T obj)
- throws IOException
+ private static <T extends Serializable> byte[] serialize(T obj) throws IOException
{
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream oos = new ObjectOutputStream(baos);
@@ -102,8 +101,7 @@ public void testNullLocalBindAddress() throws Exception
return baos.toByteArray();
}
- private static <T extends Serializable> T deserialize(byte[] b, Class<T> cl)
- throws IOException, ClassNotFoundException
+ private static <T extends Serializable> T deserialize(byte[] b, Class<T> cl) throws IOException, ClassNotFoundException
{
ByteArrayInputStream bais = new ByteArrayInputStream(b);
ObjectInputStream ois = new ObjectInputStream(bais);
View
3  tests/integration-tests/src/test/java/org/hornetq/tests/util/JMSTestBase.java
@@ -229,8 +229,7 @@ protected void registerConnectionFactory() throws Exception
* @param jndiBindings
* @throws Exception
*/
- protected void createCF(final List<TransportConfiguration> connectorConfigs, final String... jndiBindings)
- throws Exception
+ protected void createCF(final List<TransportConfiguration> connectorConfigs, final String... jndiBindings) throws Exception
{
final int retryInterval = 1000;
final double retryIntervalMultiplier = 1.0;
View
3  tests/integration-tests/src/test/java/org/hornetq/tests/util/NonSerializableFactory.java
@@ -90,8 +90,7 @@ public static Object lookup(final String name) throws NamingException
return NonSerializableFactory.getWrapperMap().get(name);
}
- public Object getObjectInstance(final Object obj, final Name name, final Context nameCtx, final Hashtable<?, ?> env)
- throws Exception
+ public Object getObjectInstance(final Object obj, final Name name, final Context nameCtx, final Hashtable<?, ?> env) throws Exception
{
Reference ref = (Reference) obj;
RefAddr addr = ref.get("nns");
View
3  tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/FakePagingManager.java
@@ -92,8 +92,7 @@ public boolean page(final ServerMessage message, final boolean duplicateDetectio
return false;
}
- public boolean page(final ServerMessage message, final long transactionId, final boolean duplicateDetection)
- throws Exception
+ public boolean page(final ServerMessage message, final long transactionId, final boolean duplicateDetection) throws Exception
{
return false;
}
View
3  tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/NonSerializableFactory.java
@@ -89,8 +89,7 @@ public static Object lookup(final String name) throws NamingException
return NonSerializableFactory.getWrapperMap().get(name);
}
- public Object getObjectInstance(final Object obj, final Name name, final Context nameCtx, final Hashtable<?, ?> env)
- throws Exception
+ public Object getObjectInstance(final Object obj, final Name name, final Context nameCtx, final Hashtable<?, ?> env) throws Exception
{
Reference ref = (Reference) obj;
RefAddr addr = ref.get("nns");
Something went wrong with that request. Please try again.