camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [1/4] camel git commit: CAMEL-8008: SubmitMulti and DataSm must check CamelSmppAlphabet header
Date Wed, 03 Dec 2014 18:31:44 GMT
Repository: camel
Updated Branches:
  refs/heads/camel-2.14.x 3e2bf592e -> 543938cf0
  refs/heads/master 7031ec87c -> ea3e10799


CAMEL-8008: SubmitMulti and DataSm must check CamelSmppAlphabet header


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

Branch: refs/heads/master
Commit: 825d069ed81e1f93e52a8466cb1425549d1dc9f6
Parents: 7031ec8
Author: Daniel Pocock <daniel@pocock.pro>
Authored: Fri Nov 7 09:27:04 2014 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Wed Dec 3 19:27:11 2014 +0100

----------------------------------------------------------------------
 .../java/org/apache/camel/component/smpp/SmppDataSmCommand.java  | 4 +++-
 .../org/apache/camel/component/smpp/SmppSubmitMultiCommand.java  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/825d069e/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppDataSmCommand.java
----------------------------------------------------------------------
diff --git a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppDataSmCommand.java
b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppDataSmCommand.java
index 98e9bf8..38db6e5 100644
--- a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppDataSmCommand.java
+++ b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppDataSmCommand.java
@@ -142,6 +142,8 @@ public class SmppDataSmCommand extends AbstractSmppCommand {
 
         if (in.getHeaders().containsKey(SmppConstants.DATA_CODING)) {
             dataSm.setDataCoding(in.getHeader(SmppConstants.DATA_CODING, java.lang.Byte.class));
+        } else if (in.getHeaders().containsKey(SmppConstants.ALPHABET)) {
+            dataSm.setDataCoding(in.getHeader(SmppConstants.ALPHABET, Byte.class));
         } else {
             dataSm.setDataCoding(config.getDataCoding());
         }
@@ -210,4 +212,4 @@ public class SmppDataSmCommand extends AbstractSmppCommand {
 
         return dataSm;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/825d069e/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSubmitMultiCommand.java
----------------------------------------------------------------------
diff --git a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSubmitMultiCommand.java
b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSubmitMultiCommand.java
index f541dab..d7e302a 100644
--- a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSubmitMultiCommand.java
+++ b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSubmitMultiCommand.java
@@ -152,6 +152,8 @@ public class SmppSubmitMultiCommand extends SmppSmCommand {
 
         if (in.getHeaders().containsKey(SmppConstants.DATA_CODING)) {
             submitMulti.setDataCoding(in.getHeader(SmppConstants.DATA_CODING, Byte.class));
+        } else if (in.getHeaders().containsKey(SmppConstants.ALPHABET)) {
+            submitMulti.setDataCoding(in.getHeader(SmppConstants.ALPHABET, Byte.class));
         } else {
             submitMulti.setDataCoding(config.getDataCoding());
         }
@@ -262,4 +264,4 @@ public class SmppSubmitMultiCommand extends SmppSmCommand {
 
         return submitMulti;
     }
-}
\ No newline at end of file
+}


Mime
View raw message