You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ta...@apache.org on 2014/09/26 23:37:49 UTC
[3/3] git commit: Remove use of HawtBuf
Remove use of HawtBuf
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/2e687e94
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/2e687e94
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/2e687e94
Branch: refs/heads/master
Commit: 2e687e9455a8f297aade142744bb1c52e1fc31a0
Parents: 10b9288
Author: Timothy Bish <ta...@gmail.com>
Authored: Fri Sep 26 17:37:38 2014 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Fri Sep 26 17:37:38 2014 -0400
----------------------------------------------------------------------
.../defaults/JmsDefaultObjectMessageFacade.java | 24 ++++++++++----------
1 file changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/2e687e94/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/defaults/JmsDefaultObjectMessageFacade.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/defaults/JmsDefaultObjectMessageFacade.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/defaults/JmsDefaultObjectMessageFacade.java
index 89442b9..f9bf220 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/defaults/JmsDefaultObjectMessageFacade.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/defaults/JmsDefaultObjectMessageFacade.java
@@ -16,28 +16,28 @@
*/
package org.apache.qpid.jms.message.facade.defaults;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.ObjectOutputStream;
import java.io.Serializable;
+import java.util.Arrays;
import org.apache.qpid.jms.message.facade.JmsObjectMessageFacade;
import org.apache.qpid.jms.util.ClassLoadingAwareObjectInputStream;
-import org.fusesource.hawtbuf.Buffer;
-import org.fusesource.hawtbuf.DataByteArrayInputStream;
-import org.fusesource.hawtbuf.DataByteArrayOutputStream;
/**
* Default implementation for a JMS Object Message Facade.
*/
public class JmsDefaultObjectMessageFacade extends JmsDefaultMessageFacade implements JmsObjectMessageFacade {
- private Buffer object;
+ private byte[] object;
- public Buffer getSerializedObject() {
+ public byte[] getSerializedObject() {
return object;
}
- public void setSerializedObject(Buffer object) {
+ public void setSerializedObject(byte[] object) {
this.object = object;
}
@@ -48,7 +48,7 @@ public class JmsDefaultObjectMessageFacade extends JmsDefaultMessageFacade imple
@Override
public boolean isEmpty() {
- return object == null || object.isEmpty();
+ return object == null || object.length == 0;
}
@Override
@@ -56,7 +56,7 @@ public class JmsDefaultObjectMessageFacade extends JmsDefaultMessageFacade imple
JmsDefaultObjectMessageFacade copy = new JmsDefaultObjectMessageFacade();
copyInto(copy);
if (!isEmpty()) {
- copy.object = object.deepCopy();
+ copy.object = Arrays.copyOf(object, object.length);
}
return copy;
@@ -76,7 +76,7 @@ public class JmsDefaultObjectMessageFacade extends JmsDefaultMessageFacade imple
Serializable serialized = null;
- try (DataByteArrayInputStream dataIn = new DataByteArrayInputStream(object);
+ try (ByteArrayInputStream dataIn = new ByteArrayInputStream(object);
ClassLoadingAwareObjectInputStream objIn = new ClassLoadingAwareObjectInputStream(dataIn)) {
serialized = (Serializable) objIn.readObject();
@@ -87,16 +87,16 @@ public class JmsDefaultObjectMessageFacade extends JmsDefaultMessageFacade imple
@Override
public void setObject(Serializable value) throws IOException {
- Buffer serialized = null;
+ byte[] serialized = null;
if (value != null) {
- try (DataByteArrayOutputStream baos = new DataByteArrayOutputStream();
+ try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream oos = new ObjectOutputStream(baos)) {
oos.writeObject(value);
oos.flush();
oos.close();
- serialized = baos.toBuffer();
+ serialized = baos.toByteArray();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org