Author: cmoulliard
Date: Mon Nov 23 09:46:16 2009
New Revision: 883294
URL: http://svn.apache.org/viewvc?rev=883294&view=rev
Log:
Solve last checkstyle errors
Modified:
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallTest.java
Modified:
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java?rev=883294&r1=883293&r2=883294&view=diff
==============================================================================
---
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java
(original)
+++
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java
Mon Nov 23 09:46:16 2009
@@ -390,16 +390,14 @@
String targetClass = oneToMany.mappedTo();
- if (targetClass != "") {
+ if (!targetClass.equals("")) {
// Class cl = Class.forName(targetClass); Does not work in
// OSGI when class is defined in another bundle
Class cl = null;
try {
cl =
Thread.currentThread().getContextClassLoader().loadClass(targetClass);
- }
-
- catch (ClassNotFoundException e) {
+ } catch (ClassNotFoundException e) {
cl =
getClass().getClassLoader().loadClass(targetClass);
}
Modified:
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallTest.java?rev=883294&r1=883293&r2=883294&view=diff
==============================================================================
---
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallTest.java
(original)
+++
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallTest.java
Mon Nov 23 09:46:16 2009
@@ -16,8 +16,6 @@
*/
package org.apache.camel.dataformat.bindy.csv;
-import static org.junit.Assert.assertEquals;
-
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.LoggingLevel;
@@ -38,6 +36,7 @@
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import
org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
+import static org.junit.Assert.assertEquals;
@ContextConfiguration(locations =
"org.apache.camel.dataformat.bindy.csv.BindySimpleCsvUnmarshallTest$ContextConfig",
loader = JavaConfigContextLoader.class)
public class BindySimpleCsvUnmarshallTest extends
AbstractJUnit4SpringContextTests {