http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/reader/MessageUtil.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/reader/MessageUtil.java b/activemq-core-client/src/main/java/org/apache/activemq/reader/MessageUtil.java index 31727d1..803b294 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/reader/MessageUtil.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/reader/MessageUtil.java @@ -18,9 +18,9 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.activemq.api.core.HornetQBuffer; -import org.apache.activemq.api.core.HornetQException; -import org.apache.activemq.api.core.HornetQPropertyConversionException; +import org.apache.activemq.api.core.ActiveMQBuffer; +import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.api.core.ActiveMQPropertyConversionException; import org.apache.activemq.api.core.Message; import org.apache.activemq.api.core.SimpleString; @@ -54,7 +54,7 @@ public class MessageUtil - public static HornetQBuffer getBodyBuffer(Message message) + public static ActiveMQBuffer getBodyBuffer(Message message) { return message.getBodyBuffer(); } @@ -97,11 +97,11 @@ public class MessageUtil } - public static final void setJMSCorrelationIDAsBytes(Message message, final byte[] correlationID) throws HornetQException + public static final void setJMSCorrelationIDAsBytes(Message message, final byte[] correlationID) throws ActiveMQException { if (correlationID == null || correlationID.length == 0) { - throw new HornetQException("Please specify a non-zero length byte[]"); + throw new ActiveMQException("Please specify a non-zero length byte[]"); } message.putBytesProperty(CORRELATIONID_HEADER_NAME, correlationID); } @@ -124,7 +124,7 @@ public class MessageUtil { return message.getStringProperty(CORRELATIONID_HEADER_NAME); } - catch (HornetQPropertyConversionException e) + catch (ActiveMQPropertyConversionException e) { return null; }
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/reader/StreamMessageUtil.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/reader/StreamMessageUtil.java b/activemq-core-client/src/main/java/org/apache/activemq/reader/StreamMessageUtil.java index 3b4b022..e1300fd 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/reader/StreamMessageUtil.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/reader/StreamMessageUtil.java @@ -13,7 +13,7 @@ package org.apache.activemq.reader; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.api.core.Message; import org.apache.activemq.api.core.Pair; import org.apache.activemq.utils.DataConstants; @@ -33,7 +33,7 @@ public class StreamMessageUtil extends MessageUtil */ public static boolean streamReadBoolean(Message message) { - HornetQBuffer buff = getBodyBuffer(message); + ActiveMQBuffer buff = getBodyBuffer(message); byte type = buff.readByte(); switch (type) @@ -51,7 +51,7 @@ public class StreamMessageUtil extends MessageUtil public static byte streamReadByte(Message message) { - HornetQBuffer buff = getBodyBuffer(message); + ActiveMQBuffer buff = getBodyBuffer(message); int index = buff.readerIndex(); try { @@ -77,7 +77,7 @@ public class StreamMessageUtil extends MessageUtil public static short streamReadShort(Message message) { - HornetQBuffer buff = getBodyBuffer(message); + ActiveMQBuffer buff = getBodyBuffer(message); byte type = buff.readByte(); switch (type) { @@ -95,7 +95,7 @@ public class StreamMessageUtil extends MessageUtil public static char streamReadChar(Message message) { - HornetQBuffer buff = getBodyBuffer(message); + ActiveMQBuffer buff = getBodyBuffer(message); byte type = buff.readByte(); switch (type) { @@ -119,7 +119,7 @@ public class StreamMessageUtil extends MessageUtil public static int streamReadInteger(Message message) { - HornetQBuffer buff = getBodyBuffer(message); + ActiveMQBuffer buff = getBodyBuffer(message); byte type = buff.readByte(); switch (type) { @@ -140,7 +140,7 @@ public class StreamMessageUtil extends MessageUtil public static long streamReadLong(Message message) { - HornetQBuffer buff = getBodyBuffer(message); + ActiveMQBuffer buff = getBodyBuffer(message); byte type = buff.readByte(); switch (type) { @@ -162,7 +162,7 @@ public class StreamMessageUtil extends MessageUtil public static float streamReadFloat(Message message) { - HornetQBuffer buff = getBodyBuffer(message); + ActiveMQBuffer buff = getBodyBuffer(message); byte type = buff.readByte(); switch (type) { @@ -179,7 +179,7 @@ public class StreamMessageUtil extends MessageUtil public static double streamReadDouble(Message message) { - HornetQBuffer buff = getBodyBuffer(message); + ActiveMQBuffer buff = getBodyBuffer(message); byte type = buff.readByte(); switch (type) { @@ -198,7 +198,7 @@ public class StreamMessageUtil extends MessageUtil public static String streamReadString(Message message) { - HornetQBuffer buff = getBodyBuffer(message); + ActiveMQBuffer buff = getBodyBuffer(message); byte type = buff.readByte(); switch (type) { @@ -234,7 +234,7 @@ public class StreamMessageUtil extends MessageUtil */ public static Pair<Integer, Integer> streamReadBytes(Message message, int remainingBytes, byte[] value) { - HornetQBuffer buff = getBodyBuffer(message); + ActiveMQBuffer buff = getBodyBuffer(message); if (remainingBytes == -1) { @@ -262,7 +262,7 @@ public class StreamMessageUtil extends MessageUtil public static Object streamReadObject(Message message) { - HornetQBuffer buff = getBodyBuffer(message); + ActiveMQBuffer buff = getBodyBuffer(message); byte type = buff.readByte(); switch (type) http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/reader/TextMessageUtil.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/reader/TextMessageUtil.java b/activemq-core-client/src/main/java/org/apache/activemq/reader/TextMessageUtil.java index 39dda8c..9341366 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/reader/TextMessageUtil.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/reader/TextMessageUtil.java @@ -13,7 +13,7 @@ package org.apache.activemq.reader; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.api.core.Message; import org.apache.activemq.api.core.SimpleString; @@ -29,7 +29,7 @@ public class TextMessageUtil extends MessageUtil */ public static void writeBodyText(Message message, SimpleString text) { - HornetQBuffer buff = getBodyBuffer(message); + ActiveMQBuffer buff = getBodyBuffer(message); buff.clear(); buff.writeNullableSimpleString(text); } @@ -39,7 +39,7 @@ public class TextMessageUtil extends MessageUtil */ public static SimpleString readBodyText(Message message) { - HornetQBuffer buff = getBodyBuffer(message); + ActiveMQBuffer buff = getBodyBuffer(message); buff.resetReaderIndex(); return buff.readNullableSimpleString(); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/spi/core/protocol/AbstractRemotingConnection.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/protocol/AbstractRemotingConnection.java b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/protocol/AbstractRemotingConnection.java index 5063991..28b3c90 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/protocol/AbstractRemotingConnection.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/protocol/AbstractRemotingConnection.java @@ -18,9 +18,9 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.Executor; -import org.apache.activemq.api.core.HornetQBuffer; -import org.apache.activemq.api.core.HornetQException; -import org.apache.activemq.api.core.HornetQInterruptedException; +import org.apache.activemq.api.core.ActiveMQBuffer; +import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.api.core.ActiveMQInterruptedException; import org.apache.activemq.core.client.HornetQClientLogger; import org.apache.activemq.core.client.HornetQClientMessageBundle; import org.apache.activemq.core.remoting.CloseListener; @@ -52,7 +52,7 @@ public abstract class AbstractRemotingConnection implements RemotingConnection return new ArrayList<FailureListener>(failureListeners); } - protected void callFailureListeners(final HornetQException me, String scaleDownTargetNodeID) + protected void callFailureListeners(final ActiveMQException me, String scaleDownTargetNodeID) { final List<FailureListener> listenersClone = new ArrayList<FailureListener>(failureListeners); @@ -62,7 +62,7 @@ public abstract class AbstractRemotingConnection implements RemotingConnection { listener.connectionFailed(me, false, scaleDownTargetNodeID); } - catch (HornetQInterruptedException interrupted) + catch (ActiveMQInterruptedException interrupted) { // this is an expected behaviour.. no warn or error here HornetQClientLogger.LOGGER.debug("thread interrupted", interrupted); @@ -179,7 +179,7 @@ public abstract class AbstractRemotingConnection implements RemotingConnection closeListeners.addAll(listeners); } - public HornetQBuffer createBuffer(final int size) + public ActiveMQBuffer createBuffer(final int size) { return transportConnection.createBuffer(size); } @@ -206,12 +206,12 @@ public abstract class AbstractRemotingConnection implements RemotingConnection /* * This can be called concurrently by more than one thread so needs to be locked */ - public void fail(final HornetQException me) + public void fail(final ActiveMQException me) { fail(me, null); } - public void bufferReceived(final Object connectionID, final HornetQBuffer buffer) + public void bufferReceived(final Object connectionID, final ActiveMQBuffer buffer) { dataReceived = true; } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/spi/core/protocol/RemotingConnection.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/protocol/RemotingConnection.java b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/protocol/RemotingConnection.java index 578d744..95d7dc6 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/protocol/RemotingConnection.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/protocol/RemotingConnection.java @@ -14,8 +14,8 @@ package org.apache.activemq.spi.core.protocol; import java.util.List; -import org.apache.activemq.api.core.HornetQBuffer; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQBuffer; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.core.remoting.CloseListener; import org.apache.activemq.core.remoting.FailureListener; import org.apache.activemq.spi.core.remoting.BufferHandler; @@ -115,14 +115,14 @@ public interface RemotingConnection extends BufferHandler * @param size the size of buffer required * @return the buffer */ - HornetQBuffer createBuffer(int size); + ActiveMQBuffer createBuffer(int size); /** * called when the underlying connection fails. * * @param me the exception that caused the failure */ - void fail(HornetQException me); + void fail(ActiveMQException me); /** * called when the underlying connection fails. @@ -130,7 +130,7 @@ public interface RemotingConnection extends BufferHandler * @param me the exception that caused the failure * @param scaleDownTargetNodeID the ID of the node where scale down is targeted */ - void fail(HornetQException me, String scaleDownTargetNodeID); + void fail(ActiveMQException me, String scaleDownTargetNodeID); /** * destroys this connection. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/BufferDecoder.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/BufferDecoder.java b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/BufferDecoder.java index 3c46adf..a4c9ba3 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/BufferDecoder.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/BufferDecoder.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.spi.core.remoting; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; /** * A BufferDecoder @@ -24,11 +24,11 @@ import org.apache.activemq.api.core.HornetQBuffer; public interface BufferDecoder { /** - * called by the remoting system prior to {@link org.apache.activemq.spi.core.remoting.BufferHandler#bufferReceived(Object, org.apache.activemq.api.core.HornetQBuffer)}. + * called by the remoting system prior to {@link org.apache.activemq.spi.core.remoting.BufferHandler#bufferReceived(Object, org.apache.activemq.api.core.ActiveMQBuffer)}. * <p> * The implementation should return true if there is enough data in the buffer to decode. otherwise false. * * @param buffer the buffer * @return true id the buffer can be decoded.. */ - int isReadyToHandle(HornetQBuffer buffer); + int isReadyToHandle(ActiveMQBuffer buffer); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/BufferHandler.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/BufferHandler.java b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/BufferHandler.java index 398a84e..fdc6375 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/BufferHandler.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/BufferHandler.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.spi.core.remoting; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; /** * A BufferHandler that will handle buffers received by an acceptor. @@ -29,5 +29,5 @@ public interface BufferHandler * @param connectionID the connection the buffer was received on * @param buffer the buffer to decode */ - void bufferReceived(Object connectionID, HornetQBuffer buffer); + void bufferReceived(Object connectionID, ActiveMQBuffer buffer); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ClientProtocolManager.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ClientProtocolManager.java b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ClientProtocolManager.java index 89227c6..c45fa8d 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ClientProtocolManager.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ClientProtocolManager.java @@ -17,7 +17,7 @@ import java.util.List; import java.util.concurrent.locks.Lock; import io.netty.channel.ChannelPipeline; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.Interceptor; import org.apache.activemq.api.core.client.ClientSessionFactory; import org.apache.activemq.spi.core.protocol.RemotingConnection; @@ -63,11 +63,11 @@ public interface ClientProtocolManager final boolean autoCommitAcks, final boolean preAcknowledge, int minLargeMessageSize, - int confirmationWindowSize) throws HornetQException; + int confirmationWindowSize) throws ActiveMQException; - boolean cleanupBeforeFailover(HornetQException cause); + boolean cleanupBeforeFailover(ActiveMQException cause); - boolean checkForFailover(String liveNodeID) throws HornetQException; + boolean checkForFailover(String liveNodeID) throws ActiveMQException; void setSessionFactory(ClientSessionFactory factory); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/Connection.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/Connection.java b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/Connection.java index d9b4098..ae2db0b 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/Connection.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/Connection.java @@ -13,7 +13,7 @@ package org.apache.activemq.spi.core.remoting; import io.netty.channel.ChannelFutureListener; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.core.security.HornetQPrincipal; import org.apache.activemq.spi.core.protocol.RemotingConnection; @@ -32,7 +32,7 @@ public interface Connection * @param size the size of buffer to create * @return the new buffer. */ - HornetQBuffer createBuffer(int size); + ActiveMQBuffer createBuffer(int size); RemotingConnection getProtocolConnection(); @@ -53,7 +53,7 @@ public interface Connection * @param flush whether to flush the buffers onto the wire * @param batched whether the packet is allowed to batched for better performance */ - void write(HornetQBuffer buffer, boolean flush, boolean batched); + void write(ActiveMQBuffer buffer, boolean flush, boolean batched); /** * writes the buffer to the connection and if flush is true returns only when the buffer has been physically written to the connection. @@ -62,14 +62,14 @@ public interface Connection * @param flush whether to flush the buffers onto the wire * @param batched whether the packet is allowed to batched for better performance */ - void write(HornetQBuffer buffer, boolean flush, boolean batched, ChannelFutureListener futureListener); + void write(ActiveMQBuffer buffer, boolean flush, boolean batched, ChannelFutureListener futureListener); /** * writes the buffer to the connection with no flushing or batching * * @param buffer the buffer to write */ - void write(HornetQBuffer buffer); + void write(ActiveMQBuffer buffer); /** http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ConnectionLifeCycleListener.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ConnectionLifeCycleListener.java b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ConnectionLifeCycleListener.java index e158fae..f079bcd 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ConnectionLifeCycleListener.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ConnectionLifeCycleListener.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.spi.core.remoting; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.core.server.HornetQComponent; /** @@ -50,7 +50,7 @@ public interface ConnectionLifeCycleListener * @param connectionID the id of the connection. * @param me the exception. */ - void connectionException(Object connectionID, HornetQException me); + void connectionException(Object connectionID, ActiveMQException me); void connectionReadyForWrites(Object connectionID, boolean ready); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/SessionContext.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/SessionContext.java b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/SessionContext.java index da3c69d..26df3b0 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/SessionContext.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/SessionContext.java @@ -18,7 +18,7 @@ import javax.transaction.xa.Xid; import java.util.HashMap; import java.util.concurrent.Executor; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.Message; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientConsumer; @@ -70,9 +70,9 @@ public abstract class SessionContext * * @param newConnection * @return true if it was possible to reattach - * @throws HornetQException + * @throws org.apache.activemq.api.core.ActiveMQException */ - public abstract boolean reattachOnNewConnection(RemotingConnection newConnection) throws HornetQException; + public abstract boolean reattachOnNewConnection(RemotingConnection newConnection) throws ActiveMQException; public RemotingConnection getRemotingConnection() { @@ -80,7 +80,7 @@ public abstract class SessionContext } - public abstract void closeConsumer(ClientConsumer consumer) throws HornetQException; + public abstract void closeConsumer(ClientConsumer consumer) throws ActiveMQException; public abstract void sendConsumerCredits(ClientConsumer consumer, int credits); @@ -136,19 +136,19 @@ public abstract class SessionContext public abstract int getCreditsOnSendingFull(MessageInternal msgI); - public abstract void sendFullMessage(MessageInternal msgI, boolean sendBlocking, SendAcknowledgementHandler handler, SimpleString defaultAddress) throws HornetQException; + public abstract void sendFullMessage(MessageInternal msgI, boolean sendBlocking, SendAcknowledgementHandler handler, SimpleString defaultAddress) throws ActiveMQException; /** * it should return the number of credits (or bytes) used to send this packet * * @param msgI * @return - * @throws HornetQException + * @throws org.apache.activemq.api.core.ActiveMQException */ - public abstract int sendInitialChunkOnLargeMessage(MessageInternal msgI) throws HornetQException; + public abstract int sendInitialChunkOnLargeMessage(MessageInternal msgI) throws ActiveMQException; - public abstract int sendLargeMessageChunk(MessageInternal msgI, long messageBodySize, boolean sendBlocking, boolean lastChunk, byte[] chunk, SendAcknowledgementHandler messageHandler) throws HornetQException; + public abstract int sendLargeMessageChunk(MessageInternal msgI, long messageBodySize, boolean sendBlocking, boolean lastChunk, byte[] chunk, SendAcknowledgementHandler messageHandler) throws ActiveMQException; public abstract void setSendAcknowledgementHandler(final SendAcknowledgementHandler handler); @@ -156,19 +156,19 @@ public abstract class SessionContext public abstract void createSharedQueue(SimpleString address, SimpleString queueName, SimpleString filterString, - boolean durable) throws HornetQException; + boolean durable) throws ActiveMQException; - public abstract void deleteQueue(SimpleString queueName) throws HornetQException; + public abstract void deleteQueue(SimpleString queueName) throws ActiveMQException; - public abstract void createQueue(SimpleString address, SimpleString queueName, SimpleString filterString, boolean durable, boolean temp) throws HornetQException; + public abstract void createQueue(SimpleString address, SimpleString queueName, SimpleString filterString, boolean durable, boolean temp) throws ActiveMQException; - public abstract ClientSession.QueueQuery queueQuery(SimpleString queueName) throws HornetQException; + public abstract ClientSession.QueueQuery queueQuery(SimpleString queueName) throws ActiveMQException; - public abstract void forceDelivery(ClientConsumer consumer, long sequence) throws HornetQException; + public abstract void forceDelivery(ClientConsumer consumer, long sequence) throws ActiveMQException; - public abstract ClientSession.AddressQuery addressQuery(final SimpleString address) throws HornetQException; + public abstract ClientSession.AddressQuery addressQuery(final SimpleString address) throws ActiveMQException; - public abstract void simpleCommit() throws HornetQException; + public abstract void simpleCommit() throws ActiveMQException; /** @@ -178,51 +178,51 @@ public abstract class SessionContext * this is because we only ACK after on the RA, We may review this if we always acked earlier. * * @param lastMessageAsDelivered - * @throws HornetQException + * @throws org.apache.activemq.api.core.ActiveMQException */ - public abstract void simpleRollback(boolean lastMessageAsDelivered) throws HornetQException; + public abstract void simpleRollback(boolean lastMessageAsDelivered) throws ActiveMQException; - public abstract void sessionStart() throws HornetQException; + public abstract void sessionStart() throws ActiveMQException; - public abstract void sessionStop() throws HornetQException; + public abstract void sessionStop() throws ActiveMQException; - public abstract void sendACK(boolean individual, boolean block, final ClientConsumer consumer, final Message message) throws HornetQException; + public abstract void sendACK(boolean individual, boolean block, final ClientConsumer consumer, final Message message) throws ActiveMQException; - public abstract void expireMessage(final ClientConsumer consumer, Message message) throws HornetQException; + public abstract void expireMessage(final ClientConsumer consumer, Message message) throws ActiveMQException; - public abstract void sessionClose() throws HornetQException; + public abstract void sessionClose() throws ActiveMQException; - public abstract void addSessionMetadata(String key, String data) throws HornetQException; + public abstract void addSessionMetadata(String key, String data) throws ActiveMQException; - public abstract void addUniqueMetaData(String key, String data) throws HornetQException; + public abstract void addUniqueMetaData(String key, String data) throws ActiveMQException; public abstract void sendProducerCreditsMessage(final int credits, final SimpleString address); - public abstract void xaCommit(Xid xid, boolean onePhase) throws XAException, HornetQException; + public abstract void xaCommit(Xid xid, boolean onePhase) throws XAException, ActiveMQException; - public abstract void xaEnd(Xid xid, int flags) throws XAException, HornetQException; + public abstract void xaEnd(Xid xid, int flags) throws XAException, ActiveMQException; - public abstract void xaForget(Xid xid) throws XAException, HornetQException; + public abstract void xaForget(Xid xid) throws XAException, ActiveMQException; - public abstract int xaPrepare(Xid xid) throws XAException, HornetQException; + public abstract int xaPrepare(Xid xid) throws XAException, ActiveMQException; - public abstract Xid[] xaScan() throws HornetQException; + public abstract Xid[] xaScan() throws ActiveMQException; - public abstract void xaRollback(Xid xid, boolean wasStarted) throws HornetQException, XAException; + public abstract void xaRollback(Xid xid, boolean wasStarted) throws ActiveMQException, XAException; - public abstract void xaStart(Xid xid, int flags) throws XAException, HornetQException; + public abstract void xaStart(Xid xid, int flags) throws XAException, ActiveMQException; - public abstract boolean configureTransactionTimeout(int seconds) throws HornetQException; + public abstract boolean configureTransactionTimeout(int seconds) throws ActiveMQException; public abstract ClientConsumerInternal createConsumer(SimpleString queueName, SimpleString filterString, int windowSize, int maxRate, int ackBatchSize, boolean browseOnly, - Executor executor, Executor flowControlExecutor) throws HornetQException; + Executor executor, Executor flowControlExecutor) throws ActiveMQException; /** * Performs a round trip to the server requesting what is the current tx timeout on the session * * @return */ - public abstract int recoverSessionTimeout() throws HornetQException; + public abstract int recoverSessionTimeout() throws ActiveMQException; public abstract int getServerVersion(); @@ -233,14 +233,14 @@ public abstract class SessionContext final boolean autoCommitSends, final boolean autoCommitAcks, final boolean preAcknowledge, - final SimpleString defaultAddress) throws HornetQException; + final SimpleString defaultAddress) throws ActiveMQException; - public abstract void recreateConsumerOnServer(ClientConsumerInternal consumerInternal) throws HornetQException; + public abstract void recreateConsumerOnServer(ClientConsumerInternal consumerInternal) throws ActiveMQException; - public abstract void xaFailed(Xid xid) throws HornetQException; + public abstract void xaFailed(Xid xid) throws ActiveMQException; - public abstract void restartSession() throws HornetQException; + public abstract void restartSession() throws ActiveMQException; public abstract void resetMetadata(HashMap<String, String> metaDataToSend); @@ -250,7 +250,7 @@ public abstract class SessionContext /** * Interrupt and return any blocked calls */ - public abstract void returnBlocking(HornetQException cause); + public abstract void returnBlocking(ActiveMQException cause); /** * it will lock the communication channel of the session avoiding anything to come while failover is happening. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/utils/BufferHelper.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/BufferHelper.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/BufferHelper.java index c4b5f8a..ca741fa 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/utils/BufferHelper.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/BufferHelper.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.utils; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.api.core.SimpleString; /** @@ -44,18 +44,18 @@ public class BufferHelper return DataConstants.SIZE_INT + str.length() * 2; } - public static void writeAsNullableSimpleString(HornetQBuffer buffer, String str) + public static void writeAsNullableSimpleString(ActiveMQBuffer buffer, String str) { buffer.writeNullableSimpleString(SimpleString.toSimpleString(str)); } - public static String readNullableSimpleStringAsString(HornetQBuffer buffer) + public static String readNullableSimpleStringAsString(ActiveMQBuffer buffer) { SimpleString str = buffer.readNullableSimpleString(); return str != null ? str.toString() : null; } - public static void writeAsSimpleString(HornetQBuffer buffer, String str) + public static void writeAsSimpleString(ActiveMQBuffer buffer, String str) { buffer.writeSimpleString(new SimpleString(str)); } @@ -63,7 +63,7 @@ public class BufferHelper /** * @param buffer */ - public static void writeNullableBoolean(HornetQBuffer buffer, Boolean value) + public static void writeNullableBoolean(ActiveMQBuffer buffer, Boolean value) { buffer.writeBoolean(value != null); @@ -78,7 +78,7 @@ public class BufferHelper return DataConstants.SIZE_BOOLEAN + (value != null ? DataConstants.SIZE_BOOLEAN : 0); } - public static Boolean readNullableBoolean(HornetQBuffer buffer) + public static Boolean readNullableBoolean(ActiveMQBuffer buffer) { boolean isNotNull = buffer.readBoolean(); @@ -95,7 +95,7 @@ public class BufferHelper /** * @param buffer */ - public static void writeNullableLong(HornetQBuffer buffer, Long value) + public static void writeNullableLong(ActiveMQBuffer buffer, Long value) { buffer.writeBoolean(value != null); @@ -108,7 +108,7 @@ public class BufferHelper /** * @param buffer */ - public static void writeNullableDouble(HornetQBuffer buffer, Double value) + public static void writeNullableDouble(ActiveMQBuffer buffer, Double value) { buffer.writeBoolean(value != null); @@ -129,7 +129,7 @@ public class BufferHelper } - public static Long readNullableLong(HornetQBuffer buffer) + public static Long readNullableLong(ActiveMQBuffer buffer) { boolean isNotNull = buffer.readBoolean(); @@ -146,7 +146,7 @@ public class BufferHelper /** * @param buffer */ - public static void writeNullableInteger(HornetQBuffer buffer, Integer value) + public static void writeNullableInteger(ActiveMQBuffer buffer, Integer value) { buffer.writeBoolean(value != null); @@ -161,7 +161,7 @@ public class BufferHelper return DataConstants.SIZE_BOOLEAN + (value != null ? DataConstants.SIZE_INT : 0); } - public static Integer readNullableInteger(HornetQBuffer buffer) + public static Integer readNullableInteger(ActiveMQBuffer buffer) { boolean isNotNull = buffer.readBoolean(); @@ -175,7 +175,7 @@ public class BufferHelper } } - public static Double readNullableDouble(HornetQBuffer buffer) + public static Double readNullableDouble(ActiveMQBuffer buffer) { boolean isNotNull = buffer.readBoolean(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/utils/ConfigurationHelper.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/ConfigurationHelper.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/ConfigurationHelper.java index f970cb0..90f3a89 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/utils/ConfigurationHelper.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/ConfigurationHelper.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.utils; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.core.client.HornetQClientLogger; import org.apache.activemq.core.client.HornetQClientMessageBundle; @@ -232,7 +232,7 @@ public class ConfigurationHelper { codec = PasswordMaskingUtil.getCodec(classImpl); } - catch (HornetQException e1) + catch (ActiveMQException e1) { throw HornetQClientMessageBundle.BUNDLE.failedToGetDecoder(e1); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/utils/HornetQBufferInputStream.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/HornetQBufferInputStream.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/HornetQBufferInputStream.java index 690febc..a5ef9d2 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/utils/HornetQBufferInputStream.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/HornetQBufferInputStream.java @@ -15,7 +15,7 @@ package org.apache.activemq.utils; import java.io.IOException; import java.io.InputStream; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; /** * Used to send large messages @@ -33,7 +33,7 @@ public class HornetQBufferInputStream extends InputStream // Constants ----------------------------------------------------- // Attributes ---------------------------------------------------- - private HornetQBuffer bb; + private ActiveMQBuffer bb; // Static -------------------------------------------------------- @@ -41,7 +41,7 @@ public class HornetQBufferInputStream extends InputStream // Public -------------------------------------------------------- - public HornetQBufferInputStream(final HornetQBuffer paramByteBuffer) + public HornetQBufferInputStream(final ActiveMQBuffer paramByteBuffer) { bb = paramByteBuffer; } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/utils/OrderedExecutorFactory.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/OrderedExecutorFactory.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/OrderedExecutorFactory.java index 9e26a6e..e6debde 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/utils/OrderedExecutorFactory.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/OrderedExecutorFactory.java @@ -15,7 +15,7 @@ package org.apache.activemq.utils; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.Executor; -import org.apache.activemq.api.core.HornetQInterruptedException; +import org.apache.activemq.api.core.ActiveMQInterruptedException; import org.apache.activemq.core.client.HornetQClientLogger; @@ -103,7 +103,7 @@ public final class OrderedExecutorFactory implements ExecutorFactory { task.run(); } - catch (HornetQInterruptedException e) + catch (ActiveMQInterruptedException e) { // This could happen during shutdowns. Nothing to be concerned about here HornetQClientLogger.LOGGER.debug("Interrupted Thread", e); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/utils/XidCodecSupport.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/XidCodecSupport.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/XidCodecSupport.java index e186d16..07193d4 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/utils/XidCodecSupport.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/XidCodecSupport.java @@ -14,7 +14,7 @@ package org.apache.activemq.utils; import javax.transaction.xa.Xid; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.core.transaction.impl.XidImpl; /** @@ -31,7 +31,7 @@ public class XidCodecSupport // Static -------------------------------------------------------- - public static void encodeXid(final Xid xid, final HornetQBuffer out) + public static void encodeXid(final Xid xid, final ActiveMQBuffer out) { out.writeInt(xid.getFormatId()); out.writeInt(xid.getBranchQualifier().length); @@ -40,7 +40,7 @@ public class XidCodecSupport out.writeBytes(xid.getGlobalTransactionId()); } - public static Xid decodeXid(final HornetQBuffer in) + public static Xid decodeXid(final ActiveMQBuffer in) { int formatID = in.readInt(); byte[] bq = new byte[in.readInt()]; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/test/java/org/apache/activemq/tests/util/RandomUtil.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/test/java/org/apache/activemq/tests/util/RandomUtil.java b/activemq-core-client/src/test/java/org/apache/activemq/tests/util/RandomUtil.java index aae7eda..169e6e6 100644 --- a/activemq-core-client/src/test/java/org/apache/activemq/tests/util/RandomUtil.java +++ b/activemq-core-client/src/test/java/org/apache/activemq/tests/util/RandomUtil.java @@ -16,8 +16,8 @@ import javax.transaction.xa.Xid; import java.util.Random; import java.util.UUID; -import org.apache.activemq.api.core.HornetQBuffer; -import org.apache.activemq.api.core.HornetQBuffers; +import org.apache.activemq.api.core.ActiveMQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffers; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.core.transaction.impl.XidImpl; @@ -70,9 +70,9 @@ public final class RandomUtil } - public static HornetQBuffer randomBuffer(final int size, final long... data) + public static ActiveMQBuffer randomBuffer(final int size, final long... data) { - HornetQBuffer buffer = HornetQBuffers.fixedBuffer(size + 8 * data.length); + ActiveMQBuffer buffer = ActiveMQBuffers.fixedBuffer(size + 8 * data.length); for (long d : data) { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/test/java/org/apache/activemq/util/TypedPropertiesConversionTest.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/test/java/org/apache/activemq/util/TypedPropertiesConversionTest.java b/activemq-core-client/src/test/java/org/apache/activemq/util/TypedPropertiesConversionTest.java index d83c158..3e3e56f 100644 --- a/activemq-core-client/src/test/java/org/apache/activemq/util/TypedPropertiesConversionTest.java +++ b/activemq-core-client/src/test/java/org/apache/activemq/util/TypedPropertiesConversionTest.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ package org.apache.activemq.util; -import org.apache.activemq.api.core.HornetQPropertyConversionException; +import org.apache.activemq.api.core.ActiveMQPropertyConversionException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.tests.util.RandomUtil; import org.apache.activemq.utils.TypedProperties; @@ -82,7 +82,7 @@ public class TypedPropertiesConversionTest props.getBooleanProperty(key); Assert.fail(); } - catch (HornetQPropertyConversionException e) + catch (ActiveMQPropertyConversionException e) { } @@ -104,7 +104,7 @@ public class TypedPropertiesConversionTest props.getCharProperty(key); Assert.fail(); } - catch (HornetQPropertyConversionException e) + catch (ActiveMQPropertyConversionException e) { } @@ -136,7 +136,7 @@ public class TypedPropertiesConversionTest props.getByteProperty(key); Assert.fail(); } - catch (HornetQPropertyConversionException e) + catch (ActiveMQPropertyConversionException e) { } @@ -172,7 +172,7 @@ public class TypedPropertiesConversionTest props.getIntProperty(key); Assert.fail(); } - catch (HornetQPropertyConversionException e) + catch (ActiveMQPropertyConversionException e) { } @@ -216,7 +216,7 @@ public class TypedPropertiesConversionTest props.getLongProperty(key); Assert.fail(); } - catch (HornetQPropertyConversionException e) + catch (ActiveMQPropertyConversionException e) { } @@ -248,7 +248,7 @@ public class TypedPropertiesConversionTest props.getDoubleProperty(key); Assert.fail(); } - catch (HornetQPropertyConversionException e) + catch (ActiveMQPropertyConversionException e) { } @@ -281,7 +281,7 @@ public class TypedPropertiesConversionTest props.getFloatProperty(key); Assert.fail(); } - catch (HornetQPropertyConversionException e) + catch (ActiveMQPropertyConversionException e) { } @@ -318,7 +318,7 @@ public class TypedPropertiesConversionTest props.getShortProperty(key); Assert.fail(); } - catch (HornetQPropertyConversionException e) + catch (ActiveMQPropertyConversionException e) { } @@ -354,7 +354,7 @@ public class TypedPropertiesConversionTest props.getBytesProperty(key); Assert.fail(); } - catch (HornetQPropertyConversionException e) + catch (ActiveMQPropertyConversionException e) { } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/test/java/org/apache/activemq/util/TypedPropertiesTest.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/test/java/org/apache/activemq/util/TypedPropertiesTest.java b/activemq-core-client/src/test/java/org/apache/activemq/util/TypedPropertiesTest.java index 41ac49a..e29cd25 100644 --- a/activemq-core-client/src/test/java/org/apache/activemq/util/TypedPropertiesTest.java +++ b/activemq-core-client/src/test/java/org/apache/activemq/util/TypedPropertiesTest.java @@ -13,8 +13,8 @@ package org.apache.activemq.util; import java.util.Iterator; -import org.apache.activemq.api.core.HornetQBuffer; -import org.apache.activemq.api.core.HornetQBuffers; +import org.apache.activemq.api.core.ActiveMQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffers; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.tests.util.RandomUtil; import org.apache.activemq.utils.TypedProperties; @@ -204,7 +204,7 @@ public class TypedPropertiesTest SimpleString keyToRemove = RandomUtil.randomSimpleString(); props.putSimpleStringProperty(keyToRemove, RandomUtil.randomSimpleString()); - HornetQBuffer buffer = HornetQBuffers.dynamicBuffer(1024); + ActiveMQBuffer buffer = ActiveMQBuffers.dynamicBuffer(1024); props.encode(buffer); Assert.assertEquals(props.getEncodeSize(), buffer.writerIndex()); @@ -228,7 +228,7 @@ public class TypedPropertiesTest { TypedProperties emptyProps = new TypedProperties(); - HornetQBuffer buffer = HornetQBuffers.dynamicBuffer(1024); + ActiveMQBuffer buffer = ActiveMQBuffers.dynamicBuffer(1024); emptyProps.encode(buffer); Assert.assertEquals(props.getEncodeSize(), buffer.writerIndex()); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQBytesMessage.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQBytesMessage.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQBytesMessage.java index d2667ff..5213ffa 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQBytesMessage.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQBytesMessage.java @@ -17,8 +17,8 @@ import javax.jms.JMSException; import javax.jms.MessageEOFException; import javax.jms.MessageFormatException; -import org.apache.activemq.api.core.HornetQBuffer; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQBuffer; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.Message; import org.apache.activemq.api.core.client.ClientMessage; import org.apache.activemq.api.core.client.ClientSession; @@ -367,7 +367,7 @@ public class HornetQBytesMessage extends HornetQMessage implements BytesMessage } @Override - public void doBeforeReceive() throws HornetQException + public void doBeforeReceive() throws ActiveMQException { bodyLength = message.getBodySize(); } @@ -412,7 +412,7 @@ public class HornetQBytesMessage extends HornetQMessage implements BytesMessage return HornetQBytesMessage.TYPE; } - private HornetQBuffer getBuffer() + private ActiveMQBuffer getBuffer() { return message.getBodyBuffer(); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQConnection.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQConnection.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQConnection.java index 1472a7c..6980131 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQConnection.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQConnection.java @@ -32,8 +32,8 @@ import java.lang.ref.WeakReference; import java.util.HashSet; import java.util.Set; -import org.apache.activemq.api.core.HornetQException; -import org.apache.activemq.api.core.HornetQExceptionType; +import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.api.core.ActiveMQExceptionType; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientSession; import org.apache.activemq.api.core.client.ClientSessionFactory; @@ -232,9 +232,9 @@ public class HornetQConnection extends HornetQConnectionForContextImpl implement { initialSession.addUniqueMetaData("jms-client-id", clientID); } - catch (HornetQException e) + catch (ActiveMQException e) { - if (e.getType() == HornetQExceptionType.DUPLICATE_METADATA) + if (e.getType() == ActiveMQExceptionType.DUPLICATE_METADATA) { throw new InvalidClientIDException("clientID=" + clientID + " was already set into another connection"); } @@ -245,7 +245,7 @@ public class HornetQConnection extends HornetQConnectionForContextImpl implement { this.addSessionMetaData(initialSession); } - catch (HornetQException e) + catch (ActiveMQException e) { JMSException ex = new JMSException("Internal error setting metadata jms-client-id"); ex.setLinkedException(e); @@ -362,7 +362,7 @@ public class HornetQConnection extends HornetQConnectionForContextImpl implement { initialSession.deleteQueue(queueName); } - catch (HornetQException ignore) + catch (ActiveMQException ignore) { // Exception on deleting queue shouldn't prevent close from completing } @@ -380,7 +380,7 @@ public class HornetQConnection extends HornetQConnectionForContextImpl implement closed = true; } - catch (HornetQException e) + catch (ActiveMQException e) { throw JMSExceptionHelper.convertFromHornetQException(e); } @@ -678,7 +678,7 @@ public class HornetQConnection extends HornetQConnectionForContextImpl implement return jbs; } - catch (HornetQException e) + catch (ActiveMQException e) { throw JMSExceptionHelper.convertFromHornetQException(e); } @@ -724,13 +724,13 @@ public class HornetQConnection extends HornetQConnectionForContextImpl implement initialSession.addFailureListener(listener); initialSession.addFailoverListener(failoverListener); } - catch (HornetQException me) + catch (ActiveMQException me) { throw JMSExceptionHelper.convertFromHornetQException(me); } } - private void addSessionMetaData(ClientSession session) throws HornetQException + private void addSessionMetaData(ClientSession session) throws ActiveMQException { session.addMetaData("jms-session", ""); if (clientID != null) @@ -762,7 +762,7 @@ public class HornetQConnection extends HornetQConnectionForContextImpl implement } @Override - public synchronized void connectionFailed(final HornetQException me, boolean failedOver) + public synchronized void connectionFailed(final ActiveMQException me, boolean failedOver) { if (me == null) { @@ -804,12 +804,12 @@ public class HornetQConnection extends HornetQConnectionForContextImpl implement } @Override - public void connectionFailed(final HornetQException me, boolean failedOver, String scaleDownTargetNodeID) + public void connectionFailed(final ActiveMQException me, boolean failedOver, String scaleDownTargetNodeID) { connectionFailed(me, failedOver); } - public void beforeReconnect(final HornetQException me) + public void beforeReconnect(final ActiveMQException me) { } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSClientBundle.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSClientBundle.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSClientBundle.java index 7e76e63..e5a6c0b 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSClientBundle.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSClientBundle.java @@ -21,9 +21,9 @@ import javax.jms.JMSRuntimeException; import javax.jms.MessageNotReadableException; import javax.jms.MessageNotWriteableException; -import org.apache.activemq.api.core.HornetQIllegalStateException; -import org.apache.activemq.api.core.HornetQInvalidFilterExpressionException; -import org.apache.activemq.api.core.HornetQNonExistentQueueException; +import org.apache.activemq.api.core.ActiveMQIllegalStateException; +import org.apache.activemq.api.core.ActiveMQInvalidFilterExpressionException; +import org.apache.activemq.api.core.ActiveMQNonExistentQueueException; import org.apache.activemq.api.core.SimpleString; import org.jboss.logging.annotations.Cause; import org.jboss.logging.annotations.Message; @@ -46,13 +46,13 @@ public interface HornetQJMSClientBundle HornetQJMSClientBundle BUNDLE = Messages.getBundle(HornetQJMSClientBundle.class); @Message(id = 129000, value = "Invalid filter: {0}", format = Message.Format.MESSAGE_FORMAT) - HornetQInvalidFilterExpressionException invalidFilter(@Cause Throwable e, SimpleString filter); + ActiveMQInvalidFilterExpressionException invalidFilter(@Cause Throwable e, SimpleString filter); @Message(id = 129001, value = "Invalid Subscription Name. It is required to set the subscription name", format = Message.Format.MESSAGE_FORMAT) - HornetQIllegalStateException invalidSubscriptionName(); + ActiveMQIllegalStateException invalidSubscriptionName(); @Message(id = 129002, value = "Destination {0} does not exist", format = Message.Format.MESSAGE_FORMAT) - HornetQNonExistentQueueException destinationDoesNotExist(SimpleString destination); + ActiveMQNonExistentQueueException destinationDoesNotExist(SimpleString destination); @Message(id = 129003, value = "name cannot be null", format = Message.Format.MESSAGE_FORMAT) IllegalArgumentException nameCannotBeNull(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSProducer.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSProducer.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSProducer.java index 54f7c05..86a5f7c 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSProducer.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQJMSProducer.java @@ -33,7 +33,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.apache.activemq.api.core.HornetQPropertyConversionException; +import org.apache.activemq.api.core.ActiveMQPropertyConversionException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.utils.TypedProperties; @@ -497,7 +497,7 @@ public final class HornetQJMSProducer implements JMSProducer { TypedProperties.setObjectProperty(new SimpleString(name), value, properties); } - catch (HornetQPropertyConversionException hqe) + catch (ActiveMQPropertyConversionException hqe) { throw new MessageFormatRuntimeException(hqe.getMessage()); } @@ -536,7 +536,7 @@ public final class HornetQJMSProducer implements JMSProducer { return properties.getBooleanProperty(new SimpleString(name)); } - catch (HornetQPropertyConversionException ce) + catch (ActiveMQPropertyConversionException ce) { throw new MessageFormatRuntimeException(ce.getMessage()); } @@ -553,7 +553,7 @@ public final class HornetQJMSProducer implements JMSProducer { return properties.getByteProperty(new SimpleString(name)); } - catch (HornetQPropertyConversionException ce) + catch (ActiveMQPropertyConversionException ce) { throw new MessageFormatRuntimeException(ce.getMessage()); } @@ -566,7 +566,7 @@ public final class HornetQJMSProducer implements JMSProducer { return properties.getShortProperty(new SimpleString(name)); } - catch (HornetQPropertyConversionException ce) + catch (ActiveMQPropertyConversionException ce) { throw new MessageFormatRuntimeException(ce.getMessage()); } @@ -579,7 +579,7 @@ public final class HornetQJMSProducer implements JMSProducer { return properties.getIntProperty(new SimpleString(name)); } - catch (HornetQPropertyConversionException ce) + catch (ActiveMQPropertyConversionException ce) { throw new MessageFormatRuntimeException(ce.getMessage()); } @@ -592,7 +592,7 @@ public final class HornetQJMSProducer implements JMSProducer { return properties.getLongProperty(new SimpleString(name)); } - catch (HornetQPropertyConversionException ce) + catch (ActiveMQPropertyConversionException ce) { throw new MessageFormatRuntimeException(ce.getMessage()); } @@ -605,7 +605,7 @@ public final class HornetQJMSProducer implements JMSProducer { return properties.getFloatProperty(new SimpleString(name)); } - catch (HornetQPropertyConversionException ce) + catch (ActiveMQPropertyConversionException ce) { throw new MessageFormatRuntimeException(ce.getMessage()); } @@ -618,7 +618,7 @@ public final class HornetQJMSProducer implements JMSProducer { return properties.getDoubleProperty(new SimpleString(name)); } - catch (HornetQPropertyConversionException ce) + catch (ActiveMQPropertyConversionException ce) { throw new MessageFormatRuntimeException(ce.getMessage()); } @@ -634,7 +634,7 @@ public final class HornetQJMSProducer implements JMSProducer return null; return prop.toString(); } - catch (HornetQPropertyConversionException ce) + catch (ActiveMQPropertyConversionException ce) { throw new MessageFormatRuntimeException(ce.getMessage()); } @@ -657,7 +657,7 @@ public final class HornetQJMSProducer implements JMSProducer } return property; } - catch (HornetQPropertyConversionException ce) + catch (ActiveMQPropertyConversionException ce) { throw new MessageFormatRuntimeException(ce.getMessage()); } @@ -681,7 +681,7 @@ public final class HornetQJMSProducer implements JMSProducer } return propNames; } - catch (HornetQPropertyConversionException ce) + catch (ActiveMQPropertyConversionException ce) { throw new MessageFormatRuntimeException(ce.getMessage()); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMapMessage.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMapMessage.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMapMessage.java index 6ee7b89..635854b 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMapMessage.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMapMessage.java @@ -20,8 +20,8 @@ import java.util.Enumeration; import java.util.HashSet; import java.util.Set; -import org.apache.activemq.api.core.HornetQException; -import org.apache.activemq.api.core.HornetQPropertyConversionException; +import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.api.core.ActiveMQPropertyConversionException; import org.apache.activemq.api.core.Message; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientMessage; @@ -201,7 +201,7 @@ public final class HornetQMapMessage extends HornetQMessage implements MapMessag { TypedProperties.setObjectProperty(new SimpleString(name), value, map); } - catch (HornetQPropertyConversionException e) + catch (ActiveMQPropertyConversionException e) { throw new MessageFormatException(e.getMessage()); } @@ -214,7 +214,7 @@ public final class HornetQMapMessage extends HornetQMessage implements MapMessag { return map.getBooleanProperty(new SimpleString(name)); } - catch (HornetQPropertyConversionException e) + catch (ActiveMQPropertyConversionException e) { throw new MessageFormatException(e.getMessage()); } @@ -226,7 +226,7 @@ public final class HornetQMapMessage extends HornetQMessage implements MapMessag { return map.getByteProperty(new SimpleString(name)); } - catch (HornetQPropertyConversionException e) + catch (ActiveMQPropertyConversionException e) { throw new MessageFormatException(e.getMessage()); } @@ -238,7 +238,7 @@ public final class HornetQMapMessage extends HornetQMessage implements MapMessag { return map.getShortProperty(new SimpleString(name)); } - catch (HornetQPropertyConversionException e) + catch (ActiveMQPropertyConversionException e) { throw new MessageFormatException(e.getMessage()); } @@ -250,7 +250,7 @@ public final class HornetQMapMessage extends HornetQMessage implements MapMessag { return map.getCharProperty(new SimpleString(name)); } - catch (HornetQPropertyConversionException e) + catch (ActiveMQPropertyConversionException e) { throw new MessageFormatException(e.getMessage()); } @@ -262,7 +262,7 @@ public final class HornetQMapMessage extends HornetQMessage implements MapMessag { return map.getIntProperty(new SimpleString(name)); } - catch (HornetQPropertyConversionException e) + catch (ActiveMQPropertyConversionException e) { throw new MessageFormatException(e.getMessage()); } @@ -274,7 +274,7 @@ public final class HornetQMapMessage extends HornetQMessage implements MapMessag { return map.getLongProperty(new SimpleString(name)); } - catch (HornetQPropertyConversionException e) + catch (ActiveMQPropertyConversionException e) { throw new MessageFormatException(e.getMessage()); } @@ -286,7 +286,7 @@ public final class HornetQMapMessage extends HornetQMessage implements MapMessag { return map.getFloatProperty(new SimpleString(name)); } - catch (HornetQPropertyConversionException e) + catch (ActiveMQPropertyConversionException e) { throw new MessageFormatException(e.getMessage()); } @@ -298,7 +298,7 @@ public final class HornetQMapMessage extends HornetQMessage implements MapMessag { return map.getDoubleProperty(new SimpleString(name)); } - catch (HornetQPropertyConversionException e) + catch (ActiveMQPropertyConversionException e) { throw new MessageFormatException(e.getMessage()); } @@ -318,7 +318,7 @@ public final class HornetQMapMessage extends HornetQMessage implements MapMessag return str.toString(); } } - catch (HornetQPropertyConversionException e) + catch (ActiveMQPropertyConversionException e) { throw new MessageFormatException(e.getMessage()); } @@ -330,7 +330,7 @@ public final class HornetQMapMessage extends HornetQMessage implements MapMessag { return map.getBytesProperty(new SimpleString(name)); } - catch (HornetQPropertyConversionException e) + catch (ActiveMQPropertyConversionException e) { throw new MessageFormatException(e.getMessage()); } @@ -392,7 +392,7 @@ public final class HornetQMapMessage extends HornetQMessage implements MapMessag } @Override - public void doBeforeReceive() throws HornetQException + public void doBeforeReceive() throws ActiveMQException { super.doBeforeReceive(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMessage.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMessage.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMessage.java index a01dcaa..4f8038f 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMessage.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMessage.java @@ -31,9 +31,9 @@ import javax.jms.Message; import javax.jms.MessageFormatException; import javax.jms.MessageNotWriteableException; -import org.apache.activemq.api.core.HornetQBuffer; -import org.apache.activemq.api.core.HornetQException; -import org.apache.activemq.api.core.HornetQPropertyConversionException; +import org.apache.activemq.api.core.ActiveMQBuffer; +import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.api.core.ActiveMQPropertyConversionException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientMessage; import org.apache.activemq.api.core.client.ClientSession; @@ -354,7 +354,7 @@ public class HornetQMessage implements javax.jms.Message { MessageUtil.setJMSCorrelationIDAsBytes(message, correlationID); } - catch (HornetQException e) + catch (ActiveMQException e) { JMSException ex = new JMSException(e.getMessage()); ex.initCause(e); @@ -543,7 +543,7 @@ public class HornetQMessage implements javax.jms.Message { return message.getBooleanProperty(new SimpleString(name)); } - catch (HornetQPropertyConversionException e) + catch (ActiveMQPropertyConversionException e) { throw new MessageFormatException(e.getMessage()); } @@ -555,7 +555,7 @@ public class HornetQMessage implements javax.jms.Message { return message.getByteProperty(new SimpleString(name)); } - catch (HornetQPropertyConversionException e) + catch (ActiveMQPropertyConversionException e) { throw new MessageFormatException(e.getMessage()); } @@ -567,7 +567,7 @@ public class HornetQMessage implements javax.jms.Message { return message.getShortProperty(new SimpleString(name)); } - catch (HornetQPropertyConversionException e) + catch (ActiveMQPropertyConversionException e) { throw new MessageFormatException(e.getMessage()); } @@ -584,7 +584,7 @@ public class HornetQMessage implements javax.jms.Message { return message.getIntProperty(new SimpleString(name)); } - catch (HornetQPropertyConversionException e) + catch (ActiveMQPropertyConversionException e) { throw new MessageFormatException(e.getMessage()); } @@ -601,7 +601,7 @@ public class HornetQMessage implements javax.jms.Message { return message.getLongProperty(new SimpleString(name)); } - catch (HornetQPropertyConversionException e) + catch (ActiveMQPropertyConversionException e) { throw new MessageFormatException(e.getMessage()); } @@ -613,7 +613,7 @@ public class HornetQMessage implements javax.jms.Message { return message.getFloatProperty(new SimpleString(name)); } - catch (HornetQPropertyConversionException e) + catch (ActiveMQPropertyConversionException e) { throw new MessageFormatException(e.getMessage()); } @@ -625,7 +625,7 @@ public class HornetQMessage implements javax.jms.Message { return message.getDoubleProperty(new SimpleString(name)); } - catch (HornetQPropertyConversionException e) + catch (ActiveMQPropertyConversionException e) { throw new MessageFormatException(e.getMessage()); } @@ -649,7 +649,7 @@ public class HornetQMessage implements javax.jms.Message return message.getStringProperty(new SimpleString(name)); } } - catch (HornetQPropertyConversionException e) + catch (ActiveMQPropertyConversionException e) { throw new MessageFormatException(e.getMessage()); } @@ -762,7 +762,7 @@ public class HornetQMessage implements javax.jms.Message { message.putObjectProperty(new SimpleString(name), value); } - catch (HornetQPropertyConversionException e) + catch (ActiveMQPropertyConversionException e) { throw new MessageFormatException(e.getMessage()); } @@ -781,7 +781,7 @@ public class HornetQMessage implements javax.jms.Message session.commit(); } - catch (HornetQException e) + catch (ActiveMQException e) { throw JMSExceptionHelper.convertFromHornetQException(e); } @@ -892,11 +892,11 @@ public class HornetQMessage implements javax.jms.Message message.getBodyBuffer(); } - public void doBeforeReceive() throws HornetQException + public void doBeforeReceive() throws ActiveMQException { message.checkCompletion(); - HornetQBuffer body = message.getBodyBuffer(); + ActiveMQBuffer body = message.getBodyBuffer(); if (body != null) { @@ -932,7 +932,7 @@ public class HornetQMessage implements javax.jms.Message { message.setOutputStream(output); } - catch (HornetQException e) + catch (ActiveMQException e) { throw JMSExceptionHelper.convertFromHornetQException(e); } @@ -950,7 +950,7 @@ public class HornetQMessage implements javax.jms.Message { message.saveToOutputStream(output); } - catch (HornetQException e) + catch (ActiveMQException e) { throw JMSExceptionHelper.convertFromHornetQException(e); } @@ -963,7 +963,7 @@ public class HornetQMessage implements javax.jms.Message { return message.waitOutputStreamCompletion(timeWait); } - catch (HornetQException e) + catch (ActiveMQException e) { throw JMSExceptionHelper.convertFromHornetQException(e); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMessageConsumer.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMessageConsumer.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMessageConsumer.java index 1d27026..48dbabb 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMessageConsumer.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMessageConsumer.java @@ -22,7 +22,7 @@ import javax.jms.Session; import javax.jms.Topic; import javax.jms.TopicSubscriber; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientConsumer; import org.apache.activemq.api.core.client.ClientMessage; @@ -109,7 +109,7 @@ public final class HornetQMessageConsumer implements QueueReceiver, TopicSubscri { consumer.setMessageHandler(coreListener); } - catch (HornetQException e) + catch (ActiveMQException e) { throw JMSExceptionHelper.convertFromHornetQException(e); } @@ -144,7 +144,7 @@ public final class HornetQMessageConsumer implements QueueReceiver, TopicSubscri session.removeConsumer(this); } - catch (HornetQException e) + catch (ActiveMQException e) { throw JMSExceptionHelper.convertFromHornetQException(e); } @@ -242,7 +242,7 @@ public final class HornetQMessageConsumer implements QueueReceiver, TopicSubscri return jmsMsg; } - catch (HornetQException e) + catch (ActiveMQException e) { throw JMSExceptionHelper.convertFromHornetQException(e); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMessageProducer.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMessageProducer.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMessageProducer.java index 3bb43c1..6f083ab 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMessageProducer.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQMessageProducer.java @@ -30,7 +30,7 @@ import javax.jms.TextMessage; import javax.jms.Topic; import javax.jms.TopicPublisher; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientMessage; import org.apache.activemq.api.core.client.ClientProducer; @@ -175,7 +175,7 @@ public class HornetQMessageProducer implements MessageProducer, QueueSender, Top { clientProducer.close(); } - catch (HornetQException e) + catch (ActiveMQException e) { throw JMSExceptionHelper.convertFromHornetQException(e); } @@ -418,7 +418,7 @@ public class HornetQMessageProducer implements MessageProducer, QueueSender, Top connection.addKnownDestination(address); } } - catch (HornetQException e) + catch (ActiveMQException e) { throw JMSExceptionHelper.convertFromHornetQException(e); } @@ -524,7 +524,7 @@ public class HornetQMessageProducer implements MessageProducer, QueueSender, Top clientProducer.send(address, coreMessage); } } - catch (HornetQException e) + catch (ActiveMQException e) { throw JMSExceptionHelper.convertFromHornetQException(e); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQObjectMessage.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQObjectMessage.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQObjectMessage.java index dfc8b10..e4d98e4 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQObjectMessage.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQObjectMessage.java @@ -21,7 +21,7 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.Serializable; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.Message; import org.apache.activemq.api.core.client.ClientMessage; import org.apache.activemq.api.core.client.ClientSession; @@ -94,7 +94,7 @@ public class HornetQObjectMessage extends HornetQMessage implements ObjectMessag } @Override - public void doBeforeReceive() throws HornetQException + public void doBeforeReceive() throws ActiveMQException { super.doBeforeReceive(); try http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQQueueBrowser.java ---------------------------------------------------------------------- diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQQueueBrowser.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQQueueBrowser.java index 86c08c6..869d299 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQQueueBrowser.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/HornetQQueueBrowser.java @@ -19,7 +19,7 @@ import javax.jms.JMSException; import javax.jms.Queue; import javax.jms.QueueBrowser; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientConsumer; import org.apache.activemq.api.core.client.ClientMessage; @@ -70,7 +70,7 @@ public final class HornetQQueueBrowser implements QueueBrowser { consumer.close(); } - catch (HornetQException e) + catch (ActiveMQException e) { throw JMSExceptionHelper.convertFromHornetQException(e); } @@ -87,7 +87,7 @@ public final class HornetQQueueBrowser implements QueueBrowser return new BrowserEnumeration(); } - catch (HornetQException e) + catch (ActiveMQException e) { throw JMSExceptionHelper.convertFromHornetQException(e); } @@ -132,7 +132,7 @@ public final class HornetQQueueBrowser implements QueueBrowser { current = consumer.receiveImmediate(); } - catch (HornetQException e) + catch (ActiveMQException e) { return false; }
