Updated Branches:
  refs/heads/camel-2.11.x 27fc93a34 -> 9f418970e

CAMEL-7142: Polished.


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

Branch: refs/heads/camel-2.11.x
Commit: 9f418970eab18165e62367a0365cf0683a98cacc
Parents: 27fc93a
Author: Babak Vahdat <[email protected]>
Authored: Sun Jan 19 14:12:29 2014 +0100
Committer: Babak Vahdat <[email protected]>
Committed: Sun Jan 19 14:15:08 2014 +0100

----------------------------------------------------------------------
 .../org/apache/camel/dataformat/csv/CsvDataFormat.java  | 10 +++++-----
 .../csv/CsvUnmarshalTwoCsvDataFormatConcurrentTest.java | 12 +++++++-----
 2 files changed, 12 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/9f418970/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvDataFormat.java
----------------------------------------------------------------------
diff --git 
a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvDataFormat.java
 
b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvDataFormat.java
index 003836e..a6710c5 100644
--- 
a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvDataFormat.java
+++ 
b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvDataFormat.java
@@ -65,9 +65,9 @@ public class CsvDataFormat implements DataFormat {
         for (Field field : CSVStrategy.class.getFields()) {
             try {
                 if (field.get(null) == csvStrategy) {
-                    // return a safe copy of the declared constant so that we 
don't cause any side effect
-                    // by (potentially) other CsvDataFormat objects in use as 
we change properties of
-                    // the strategy (e.g. it's set delimiter through the 
#unmarshal() method below)
+                    // return a safe copy of the declared static constant so 
that we don't cause any side effect
+                    // by (potentially) other CsvDataFormat objects in use, as 
we change the properties of the
+                    // strategy itself (e.g. it's set delimiter through the 
#unmarshal() method below)
                     LOGGER.debug("Returning a clone of {} as it is the 
declared constant {} by the CSVStrategy class", csvStrategy, field.getName());
 
                     return (CSVStrategy) csvStrategy.clone();
@@ -77,7 +77,7 @@ public class CsvDataFormat implements DataFormat {
             }
         }
 
-        // not a declared constant of CSVStrategy, so return it as is
+        // not a declared static constant of CSVStrategy so return it as is
         return csvStrategy;
     }
 
@@ -208,4 +208,4 @@ public class CsvDataFormat implements DataFormat {
             }
         }
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/9f418970/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTwoCsvDataFormatConcurrentTest.java
----------------------------------------------------------------------
diff --git 
a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTwoCsvDataFormatConcurrentTest.java
 
b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTwoCsvDataFormatConcurrentTest.java
index c721fd3..08dbc61 100644
--- 
a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTwoCsvDataFormatConcurrentTest.java
+++ 
b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTwoCsvDataFormatConcurrentTest.java
@@ -50,6 +50,7 @@ public class CsvUnmarshalTwoCsvDataFormatConcurrentTest 
extends CamelTestSupport
 
     private void sendAndVerify(String delimiter, MockEndpoint mock) throws 
InterruptedException {
         template.sendBody("direct:start", "123" + delimiter + "Camel in 
Action" + delimiter + "1\n124" + delimiter + "ActiveMQ in Action" + delimiter + 
"2");
+
         assertMockEndpointsSatisfied();
 
         @SuppressWarnings("unchecked")
@@ -73,15 +74,16 @@ public class CsvUnmarshalTwoCsvDataFormatConcurrentTest 
extends CamelTestSupport
                 CsvDataFormat csv2 = new CsvDataFormat();
                 csv2.setDelimiter(";");
 
-                
from("direct:start").multicast().parallelProcessing().to("direct:csv", 
"direct:csv2");
+                from("direct:start")
+                    .multicast().parallelProcessing().to("direct:csv", 
"direct:csv2");
 
                 from("direct:csv")
-                        .unmarshal(csv)
-                        .to("mock:result");
+                    .unmarshal(csv)
+                    .to("mock:result");
 
                 from("direct:csv2")
-                        .unmarshal(csv2)
-                        .to("mock:result2");
+                    .unmarshal(csv2)
+                    .to("mock:result2");
             }
         };
     }

Reply via email to