[camel] 03/03: CAMEL-13689: camel-core - Converting string to boolean should only accept true or false literals

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit a1b1934701bfec4d8ca5307bfa5ca932d745d9a0
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu Jun 27 06:43:08 2019 +0200

    CAMEL-13689: camel-core - Converting string to boolean should only accept 
true or false literals
---
 .../camel/component/file/remote/PaddyRouteTest.java   |  2 +-
 .../component/servlet/CamelHttpTransportServlet.java  | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git 
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/PaddyRouteTest.java
 
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/PaddyRouteTest.java
index f7fdc6c..f462afb 100644
--- 
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/PaddyRouteTest.java
+++ 
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/PaddyRouteTest.java
@@ -37,7 +37,7 @@ public class PaddyRouteTest extends FtpServerTestSupport {
         MockEndpoint mock = getMockEndpoint("mock:result");
         mock.expectedMessageCount(1);
 
-        sendFile(getFtpUrl() + "/?password=admin", "Hello World", 
"incoming/hello.txt");
+        sendFile(getFtpUrl(), "Hello World", "incoming/hello.txt");
 
         assertMockEndpointsSatisfied();
     }
diff --git 
a/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java
 
b/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java
index b1c5b5e..abb727e 100644
--- 
a/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java
+++ 
b/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java
@@ -23,6 +23,7 @@ import org.apache.camel.converter.ObjectConverter;
 import org.apache.camel.http.common.CamelServlet;
 import org.apache.camel.http.common.HttpConsumer;
 import org.apache.camel.http.common.HttpRestServletResolveConsumerStrategy;
+import org.apache.camel.util.ObjectHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -44,14 +45,16 @@ public class CamelHttpTransportServlet extends CamelServlet 
{
         this.setServletResolveConsumerStrategy(new 
HttpRestServletResolveConsumerStrategy());
 
         String ignore = config.getInitParameter("ignoreDuplicateServletName");
-        Boolean bool = ObjectConverter.toBoolean(ignore);
-        if (bool != null) {
-            ignoreDuplicateServletName = bool;
-        } else {
-            // always log so people can see it easier
-            String msg = "Invalid parameter value for init-parameter 
ignoreDuplicateServletName with value: " + ignore;
-            LOG.error(msg);
-            throw new ServletException(msg);
+        if (ObjectHelper.isNotEmpty(ignore)) {
+            Boolean bool = ObjectConverter.toBoolean(ignore);
+            if (bool != null) {
+                ignoreDuplicateServletName = bool;
+            } else {
+                // always log so people can see it easier
+                String msg = "Invalid parameter value for init-parameter 
ignoreDuplicateServletName with value: " + ignore;
+                LOG.error(msg);
+                throw new ServletException(msg);
+            }
         }
 
         String name = config.getServletName();