Author: hadrian
Date: Mon May 30 21:59:13 2011
New Revision: 1129396
URL: http://svn.apache.org/viewvc?rev=1129396&view=rev
Log:
CAMEL-3834. Port fix to 2.7.2
Modified:
camel/branches/camel-2.7.x/ (props changed)
camel/branches/camel-2.7.x/components/camel-http/ (props changed)
camel/branches/camel-2.7.x/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppProducer.java
camel/branches/camel-2.7.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerTest.java
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 30 21:59:13 2011
@@ -1 +1 @@
-/camel/trunk:1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166
+/camel/trunk:1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1091518
Propchange: camel/branches/camel-2.7.x/components/camel-http/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 30 21:59:13 2011
@@ -1 +1 @@
-/camel/trunk/components/camel-http:917526,1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166
+/camel/trunk/components/camel-http:917526,1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1091518
Modified:
camel/branches/camel-2.7.x/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppProducer.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppProducer.java?rev=1129396&r1=1129395&r2=1129396&view=diff
==============================================================================
---
camel/branches/camel-2.7.x/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppProducer.java
(original)
+++
camel/branches/camel-2.7.x/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppProducer.java
Mon May 30 21:59:13 2011
@@ -143,7 +143,7 @@ public class SmppProducer extends Defaul
submitSm.getReplaceIfPresent(),
new GeneralDataCoding(
false,
- false,
+ true,
MessageClass.CLASS1,
Alphabet.valueOf(submitSm.getDataCoding())),
(byte) 0,
Modified:
camel/branches/camel-2.7.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerTest.java?rev=1129396&r1=1129395&r2=1129396&view=diff
==============================================================================
---
camel/branches/camel-2.7.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerTest.java
(original)
+++
camel/branches/camel-2.7.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerTest.java
Mon May 30 21:59:13 2011
@@ -184,7 +184,7 @@ public class SmppProducerTest {
eq((byte) 0),
eq(new GeneralDataCoding(
false,
- false,
+ true,
MessageClass.CLASS1,
Alphabet.ALPHA_DEFAULT)),
eq((byte) 0),
@@ -231,7 +231,7 @@ public class SmppProducerTest {
eq((byte) 0),
eq(new GeneralDataCoding(
false,
- false,
+ true,
MessageClass.CLASS1,
Alphabet.ALPHA_DEFAULT)),
eq((byte) 0),
@@ -295,7 +295,7 @@ public class SmppProducerTest {
eq((byte) 0),
eq(new GeneralDataCoding(
false,
- false,
+ true,
MessageClass.CLASS1,
Alphabet.ALPHA_8_BIT)),
eq((byte) 0),
