You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2012/03/16 19:20:31 UTC
svn commit: r1301679 - in /camel/branches/camel-2.9.x: ./
camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
Author: bvahdat
Date: Fri Mar 16 18:20:31 2012
New Revision: 1301679
URL: http://svn.apache.org/viewvc?rev=1301679&view=rev
Log:
Merged revisions 1301678 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1301678 | bvahdat | 2012-03-16 19:17:20 +0100 (Fr, 16 Mrz 2012) | 1 line
CAMEL-5100: By CsvDataFormat make use of the Boolean wrapper type.
........
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 16 18:20:31 2012
@@ -1 +1 @@
-/camel/trunk:1243046,1243057,1243234,1244518,1244644,1244859,1244861,1244864,1244870,1244872,1245021,1291555,1291727,1291848,1291864,1292114,1292384,1292725,1292760,1292767,1293079,1293268,1293288,1293330,1293590,1293828,1293852,1293855,1294130,1294482,1294502,1294533,1294588,1294639,1294709,1294909,1294976,1295073,1295108,1295120,1296653,1296790,1298125,1298155,1298447,1298795,1298821,1298993,1299383,1299399,1300720-1300722,1300805,1300826,1300831,1300959,1301376,1301394,1301571,1301631,1301656
+/camel/trunk:1243046,1243057,1243234,1244518,1244644,1244859,1244861,1244864,1244870,1244872,1245021,1291555,1291727,1291848,1291864,1292114,1292384,1292725,1292760,1292767,1293079,1293268,1293288,1293330,1293590,1293828,1293852,1293855,1294130,1294482,1294502,1294533,1294588,1294639,1294709,1294909,1294976,1295073,1295108,1295120,1296653,1296790,1298125,1298155,1298447,1298795,1298821,1298993,1299383,1299399,1300720-1300722,1300805,1300826,1300831,1300959,1301376,1301394,1301571,1301631,1301656,1301678
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java?rev=1301679&r1=1301678&r2=1301679&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java (original)
+++ camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java Fri Mar 16 18:20:31 2012
@@ -46,11 +46,11 @@ public class CsvDataFormat extends DataF
setDelimiter(delimiter);
}
- public boolean isAutogenColumns() {
+ public Boolean isAutogenColumns() {
return autogenColumns;
}
- public void setAutogenColumns(boolean autogenColumns) {
+ public void setAutogenColumns(Boolean autogenColumns) {
this.autogenColumns = autogenColumns;
}