Repository: camel Updated Branches: refs/heads/camel-2.14.x 046f438d4 -> a219cc3d1
Fixed the CS errors in camel-2.14.x branch Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a219cc3d Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a219cc3d Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a219cc3d Branch: refs/heads/camel-2.14.x Commit: a219cc3d1eac4833fe5e1444ee4aaae5baee6edb Parents: 046f438 Author: Willem Jiang <willem.ji...@gmail.com> Authored: Thu Feb 26 15:29:37 2015 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Thu Feb 26 15:29:37 2015 +0800 ---------------------------------------------------------------------- .../component/file/remote/RemoteFileIgnoreDoPollErrorTest.java | 4 +--- .../camel/spring/spi/BridgePropertyPlaceholderConfigurer.java | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/a219cc3d/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/RemoteFileIgnoreDoPollErrorTest.java ---------------------------------------------------------------------- diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/RemoteFileIgnoreDoPollErrorTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/RemoteFileIgnoreDoPollErrorTest.java index f7e8dd89..bcd4201 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/RemoteFileIgnoreDoPollErrorTest.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/RemoteFileIgnoreDoPollErrorTest.java @@ -94,10 +94,8 @@ public class RemoteFileIgnoreDoPollErrorTest { throw new IllegalStateException("Problem"); } else if ("GenericFileOperationFailedException".equals(doPollResult)) { throw new GenericFileOperationFailedException("Perm error"); - } else if ("true".equals(doPollResult)) { - return true; } else { - return false; + return "true".equals(doPollResult); } } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/a219cc3d/components/camel-spring/src/main/java/org/apache/camel/spring/spi/BridgePropertyPlaceholderConfigurer.java ---------------------------------------------------------------------- diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/BridgePropertyPlaceholderConfigurer.java b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/BridgePropertyPlaceholderConfigurer.java index eeb260d..8cc2812 100644 --- a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/BridgePropertyPlaceholderConfigurer.java +++ b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/BridgePropertyPlaceholderConfigurer.java @@ -106,7 +106,7 @@ public class BridgePropertyPlaceholderConfigurer extends PropertyPlaceholderConf super.setIgnoreUnresolvablePlaceholders(ignoreUnresolvablePlaceholders); this.configuredIgnoreUnresolvablePlaceholders = ignoreUnresolvablePlaceholders; } - + @Override public void setIgnoreResourceNotFound(boolean ignoreResourceNotFound) { super.setIgnoreResourceNotFound(ignoreResourceNotFound); @@ -228,7 +228,7 @@ public class BridgePropertyPlaceholderConfigurer extends PropertyPlaceholderConf } } - private class BridgePropertiesParser implements PropertiesParser { + private final class BridgePropertiesParser implements PropertiesParser { private final PropertiesParser delegate; private final PropertiesParser parser;
