2 new revisions:
Revision: 0f45f17aaeee
Author: [email protected] <[email protected]>
Date: Sat Dec 1 02:37:37 2012
Log: Issue 189: Decoding of
org.mobicents.ss7.management.transceiver.Messag...
http://code.google.com/p/jss7/source/detail?r=0f45f17aaeee
Revision: 112f93362909
Author: [email protected] <[email protected]>
Date: Sat Dec 1 02:39:10 2012
Log: Merge branch 'master' of https://code.google.com/p/jss7/
http://code.google.com/p/jss7/source/detail?r=112f93362909
==============================================================================
Revision: 0f45f17aaeee
Author: [email protected] <[email protected]>
Date: Sat Dec 1 02:37:37 2012
Log: Issue 189: Decoding of
org.mobicents.ss7.management.transceiver.Message
fails if empty data sent.
http://code.google.com/p/jss7/source/detail?r=0f45f17aaeee
Modified:
/management/shell-transport/src/main/java/org/mobicents/ss7/management/transceiver/Message.java
/management/shell-transport/src/main/java/org/mobicents/ss7/management/transceiver/MessageFactory.java
/management/shell-transport/src/test/java/org/mobicents/ss7/management/transceiver/MessageFactoryTest.java
=======================================
---
/management/shell-transport/src/main/java/org/mobicents/ss7/management/transceiver/Message.java
Sun Sep 23 01:37:36 2012
+++
/management/shell-transport/src/main/java/org/mobicents/ss7/management/transceiver/Message.java
Sat Dec 1 02:37:37 2012
@@ -23,6 +23,7 @@
package org.mobicents.ss7.management.transceiver;
import java.nio.ByteBuffer;
+import java.util.Arrays;
/**
* Represents the Shell Command protocol data unit
@@ -74,5 +75,33 @@
public String toString() {
return new String(data);
}
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#hashCode()
+ */
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + Arrays.hashCode(data);
+ return result;
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#equals(java.lang.Object)
+ */
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ Message other = (Message) obj;
+ if (!Arrays.equals(data, other.data))
+ return false;
+ return true;
+ }
}
=======================================
---
/management/shell-transport/src/main/java/org/mobicents/ss7/management/transceiver/MessageFactory.java
Sun Sep 23 01:37:36 2012
+++
/management/shell-transport/src/main/java/org/mobicents/ss7/management/transceiver/MessageFactory.java
Sat Dec 1 02:37:37 2012
@@ -107,7 +107,7 @@
// at this point we must recheck remainder of the input buffer
// because possible case when input buffer fits exactly to the
header
- if (!buffer.hasRemaining()) {
+ if (length>0 && !buffer.hasRemaining()) {
return null;
}
=======================================
---
/management/shell-transport/src/test/java/org/mobicents/ss7/management/transceiver/MessageFactoryTest.java
Sun Sep 23 01:37:36 2012
+++
/management/shell-transport/src/test/java/org/mobicents/ss7/management/transceiver/MessageFactoryTest.java
Sat Dec 1 02:37:37 2012
@@ -58,6 +58,19 @@
@AfterTest
public void tearDown() {
}
+
+ @Test
+ public void testEmptyMessage() throws IOException {
+ Message msgInput = messageFactory.createMessage("");
+
+ ByteBuffer rxBuffer = ByteBuffer.allocateDirect(8192);
+ msgInput.encode(rxBuffer);
+ rxBuffer.flip();
+
+ Message messageOutpu = messageFactory.createMessage(rxBuffer);
+
+ assertEquals(messageOutpu, msgInput);
+ }
@Test
public void testLongMessage() throws IOException {
==============================================================================
Revision: 112f93362909
Author: [email protected] <[email protected]>
Date: Sat Dec 1 02:39:10 2012
Log: Merge branch 'master' of https://code.google.com/p/jss7/
http://code.google.com/p/jss7/source/detail?r=112f93362909
