You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2014/10/10 13:01:03 UTC
[2/4] git commit: rename for clarity
rename for clarity
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/c4690c48
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/c4690c48
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/c4690c48
Branch: refs/heads/master
Commit: c4690c486fc99e8a204d17420e61cb38a583178e
Parents: 1794cbb
Author: Robert Gemmell <ro...@apache.org>
Authored: Fri Oct 10 11:18:45 2014 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Fri Oct 10 11:18:45 2014 +0100
----------------------------------------------------------------------
.../amqp/message/AmqpJmsBytesMessageFacade.java | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/c4690c48/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsBytesMessageFacade.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsBytesMessageFacade.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsBytesMessageFacade.java
index 9438413..553a044 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsBytesMessageFacade.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsBytesMessageFacade.java
@@ -27,7 +27,6 @@ import io.netty.buffer.Unpooled;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.util.Arrays;
import javax.jms.IllegalStateException;
import javax.jms.JMSException;
@@ -47,8 +46,8 @@ import org.apache.qpid.proton.message.Message;
*/
public class AmqpJmsBytesMessageFacade extends AmqpJmsMessageFacade implements JmsBytesMessageFacade {
- private static final Binary EMPTY_BODY = new Binary(new byte[0]);
- private static final Data EMPTY_DATA = new Data(EMPTY_BODY);
+ private static final Binary EMPTY_BINARY = new Binary(new byte[0]);
+ private static final Data EMPTY_BODY = new Data(EMPTY_BINARY);
private transient ByteBufInputStream bytesIn;
private transient ByteBufOutputStream bytesOut;
@@ -90,7 +89,7 @@ public class AmqpJmsBytesMessageFacade extends AmqpJmsMessageFacade implements J
System.arraycopy(payload.getArray(), payload.getArrayOffset(), result, 0, payload.getLength());
copy.message.setBody(new Data(new Binary(result)));
} else {
- copy.message.setBody(EMPTY_DATA);
+ copy.message.setBody(EMPTY_BODY);
}
return copy;
@@ -125,7 +124,7 @@ public class AmqpJmsBytesMessageFacade extends AmqpJmsMessageFacade implements J
bytesOut = null;
}
- message.setBody(EMPTY_DATA);
+ message.setBody(EMPTY_BODY);
}
@Override
@@ -152,7 +151,7 @@ public class AmqpJmsBytesMessageFacade extends AmqpJmsMessageFacade implements J
if (bytesOut == null) {
bytesOut = new ByteBufOutputStream(Unpooled.buffer());
- message.setBody(EMPTY_DATA);
+ message.setBody(EMPTY_BODY);
}
return bytesOut;
@@ -185,7 +184,7 @@ public class AmqpJmsBytesMessageFacade extends AmqpJmsMessageFacade implements J
private Binary getBinaryFromBody() {
Section body = getAmqpMessage().getBody();
- Binary result = EMPTY_BODY;
+ Binary result = EMPTY_BINARY;
if (body == null) {
return result;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org