You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/05/30 09:34:58 UTC

[1/2] camel git commit: CAMEL-8811: No data coding headers in deliverSM

Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x b2188887a -> caa6db543
  refs/heads/master 244592818 -> 36424430c


CAMEL-8811: No data coding headers in deliverSM


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/36424430
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/36424430
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/36424430

Branch: refs/heads/master
Commit: 36424430cf91c3bb5659986015729eee9ee61824
Parents: 2445928
Author: Claus Ibsen <da...@apache.org>
Authored: Sat May 30 09:38:55 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat May 30 09:38:55 2015 +0200

----------------------------------------------------------------------
 .../main/java/org/apache/camel/component/smpp/SmppBinding.java   | 1 +
 .../java/org/apache/camel/component/smpp/SmppBindingTest.java    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/36424430/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppBinding.java
----------------------------------------------------------------------
diff --git a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppBinding.java b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppBinding.java
index c1a8a8e..e93dbe4 100644
--- a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppBinding.java
+++ b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppBinding.java
@@ -141,6 +141,7 @@ public class SmppBinding {
             smppMessage.setHeader(SmppConstants.SOURCE_ADDR, deliverSm.getSourceAddr());
             smppMessage.setHeader(SmppConstants.SOURCE_ADDR_NPI, deliverSm.getSourceAddrNpi());
             smppMessage.setHeader(SmppConstants.SOURCE_ADDR_TON, deliverSm.getSourceAddrTon());
+            smppMessage.setHeader(SmppConstants.DATA_CODING, deliverSm.getDataCoding());
             smppMessage.setHeader(SmppConstants.DEST_ADDR, deliverSm.getDestAddress());
             smppMessage.setHeader(SmppConstants.DEST_ADDR_NPI, deliverSm.getDestAddrNpi());
             smppMessage.setHeader(SmppConstants.DEST_ADDR_TON, deliverSm.getDestAddrTon());

http://git-wip-us.apache.org/repos/asf/camel/blob/36424430/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppBindingTest.java
----------------------------------------------------------------------
diff --git a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppBindingTest.java b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppBindingTest.java
index b440831..890d871 100644
--- a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppBindingTest.java
+++ b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppBindingTest.java
@@ -187,7 +187,7 @@ public class SmppBindingTest {
         SmppMessage smppMessage = binding.createSmppMessage(deliverSm);
         
         assertEquals("Hello SMPP world!", smppMessage.getBody());
-        assertEquals(12, smppMessage.getHeaders().size());
+        assertEquals(13, smppMessage.getHeaders().size());
         assertEquals(1, smppMessage.getHeader(SmppConstants.SEQUENCE_NUMBER));
         assertEquals(1, smppMessage.getHeader(SmppConstants.COMMAND_ID));
         assertEquals("1818", smppMessage.getHeader(SmppConstants.SOURCE_ADDR));
@@ -220,7 +220,7 @@ public class SmppBindingTest {
         SmppMessage smppMessage = binding.createSmppMessage(deliverSm);
         
         assertEquals("Hello SMPP world!", smppMessage.getBody());
-        assertEquals(12, smppMessage.getHeaders().size());
+        assertEquals(13, smppMessage.getHeaders().size());
         assertEquals(1, smppMessage.getHeader(SmppConstants.SEQUENCE_NUMBER));
         assertEquals(1, smppMessage.getHeader(SmppConstants.COMMAND_ID));
         assertEquals("1818", smppMessage.getHeader(SmppConstants.SOURCE_ADDR));


[2/2] camel git commit: CAMEL-8811: No data coding headers in deliverSM

Posted by da...@apache.org.
CAMEL-8811: No data coding headers in deliverSM


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/caa6db54
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/caa6db54
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/caa6db54

Branch: refs/heads/camel-2.15.x
Commit: caa6db54358471a8a6080019278018e37fa87c1d
Parents: b218888
Author: Claus Ibsen <da...@apache.org>
Authored: Sat May 30 09:38:55 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat May 30 09:39:27 2015 +0200

----------------------------------------------------------------------
 .../main/java/org/apache/camel/component/smpp/SmppBinding.java   | 1 +
 .../java/org/apache/camel/component/smpp/SmppBindingTest.java    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/caa6db54/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppBinding.java
----------------------------------------------------------------------
diff --git a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppBinding.java b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppBinding.java
index c1a8a8e..e93dbe4 100644
--- a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppBinding.java
+++ b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppBinding.java
@@ -141,6 +141,7 @@ public class SmppBinding {
             smppMessage.setHeader(SmppConstants.SOURCE_ADDR, deliverSm.getSourceAddr());
             smppMessage.setHeader(SmppConstants.SOURCE_ADDR_NPI, deliverSm.getSourceAddrNpi());
             smppMessage.setHeader(SmppConstants.SOURCE_ADDR_TON, deliverSm.getSourceAddrTon());
+            smppMessage.setHeader(SmppConstants.DATA_CODING, deliverSm.getDataCoding());
             smppMessage.setHeader(SmppConstants.DEST_ADDR, deliverSm.getDestAddress());
             smppMessage.setHeader(SmppConstants.DEST_ADDR_NPI, deliverSm.getDestAddrNpi());
             smppMessage.setHeader(SmppConstants.DEST_ADDR_TON, deliverSm.getDestAddrTon());

http://git-wip-us.apache.org/repos/asf/camel/blob/caa6db54/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppBindingTest.java
----------------------------------------------------------------------
diff --git a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppBindingTest.java b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppBindingTest.java
index b440831..890d871 100644
--- a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppBindingTest.java
+++ b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppBindingTest.java
@@ -187,7 +187,7 @@ public class SmppBindingTest {
         SmppMessage smppMessage = binding.createSmppMessage(deliverSm);
         
         assertEquals("Hello SMPP world!", smppMessage.getBody());
-        assertEquals(12, smppMessage.getHeaders().size());
+        assertEquals(13, smppMessage.getHeaders().size());
         assertEquals(1, smppMessage.getHeader(SmppConstants.SEQUENCE_NUMBER));
         assertEquals(1, smppMessage.getHeader(SmppConstants.COMMAND_ID));
         assertEquals("1818", smppMessage.getHeader(SmppConstants.SOURCE_ADDR));
@@ -220,7 +220,7 @@ public class SmppBindingTest {
         SmppMessage smppMessage = binding.createSmppMessage(deliverSm);
         
         assertEquals("Hello SMPP world!", smppMessage.getBody());
-        assertEquals(12, smppMessage.getHeaders().size());
+        assertEquals(13, smppMessage.getHeaders().size());
         assertEquals(1, smppMessage.getHeader(SmppConstants.SEQUENCE_NUMBER));
         assertEquals(1, smppMessage.getHeader(SmppConstants.COMMAND_ID));
         assertEquals("1818", smppMessage.getHeader(SmppConstants.SOURCE_ADDR));