You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2017/03/23 13:08:16 UTC
[1/2] camel git commit: CAMEL-11057: Undertow Producer : NPE if
tryConvertTo fails to convert exchange body to ByteBuffer
Repository: camel
Updated Branches:
refs/heads/master 5586f91c4 -> 7ba190216
CAMEL-11057: Undertow Producer : NPE if tryConvertTo fails to convert exchange body to ByteBuffer
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3bc26bef
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3bc26bef
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3bc26bef
Branch: refs/heads/master
Commit: 3bc26bef77b8d91944ebc20d2e46d5c1b4587f34
Parents: 5586f91
Author: lburgazzoli <lb...@gmail.com>
Authored: Thu Mar 23 14:03:31 2017 +0100
Committer: lburgazzoli <lb...@gmail.com>
Committed: Thu Mar 23 14:03:31 2017 +0100
----------------------------------------------------------------------
.../org/apache/camel/component/undertow/UndertowProducer.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3bc26bef/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowProducer.java b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowProducer.java
index 0bca663..a4133df 100644
--- a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowProducer.java
+++ b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowProducer.java
@@ -128,7 +128,9 @@ public class UndertowProducer extends DefaultAsyncProducer {
final TypeConverter tc = endpoint.getCamelContext().getTypeConverter();
final ByteBuffer bodyAsByte = tc.tryConvertTo(ByteBuffer.class, body);
- if (body != null) {
+ // As tryConvertTo is used to convert the body, we should do null check
+ // or the call bodyAsByte.remaining() may throw an NPE
+ if (body != null && bodyAsByte != null) {
requestHeaders.put(Headers.CONTENT_LENGTH, bodyAsByte.remaining());
}
[2/2] camel git commit: Fix CS
Posted by lb...@apache.org.
Fix CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7ba19021
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7ba19021
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7ba19021
Branch: refs/heads/master
Commit: 7ba19021655a105422a9c191cc1a55258d662283
Parents: 3bc26be
Author: lburgazzoli <lb...@gmail.com>
Authored: Thu Mar 23 14:08:10 2017 +0100
Committer: lburgazzoli <lb...@gmail.com>
Committed: Thu Mar 23 14:08:10 2017 +0100
----------------------------------------------------------------------
.../main/java/org/apache/camel/ComponentVerifier.java | 2 +-
.../apache/camel/management/ManagedComponentTest.java | 12 +++++++-----
.../apache/camel/management/ManagementTestSupport.java | 2 +-
3 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7ba19021/camel-core/src/main/java/org/apache/camel/ComponentVerifier.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/ComponentVerifier.java b/camel-core/src/main/java/org/apache/camel/ComponentVerifier.java
index 969b25b..53cb8c7 100644
--- a/camel-core/src/main/java/org/apache/camel/ComponentVerifier.java
+++ b/camel-core/src/main/java/org/apache/camel/ComponentVerifier.java
@@ -58,7 +58,7 @@ public interface ComponentVerifier {
private static final Scope[] VALUES = values();
public static Scope fromString(String scope) {
- for (int i=0; i < VALUES.length; i++) {
+ for (int i = 0; i < VALUES.length; i++) {
if (ObjectHelper.equal(scope, VALUES[i].name(), true)) {
return VALUES[i];
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7ba19021/camel-core/src/test/java/org/apache/camel/management/ManagedComponentTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedComponentTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedComponentTest.java
index 00ade1f..491e766 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedComponentTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedComponentTest.java
@@ -31,7 +31,9 @@ import org.apache.camel.impl.verifier.DefaultComponentVerifier;
import org.apache.camel.impl.verifier.ResultBuilder;
public class ManagedComponentTest extends ManagementTestSupport {
- private static final String[] VERIFY_SIGNATURE = new String[]{ "java.lang.String", "java.util.Map" };
+ private static final String[] VERIFY_SIGNATURE = new String[] {
+ "java.lang.String", "java.util.Map"
+ };
@Override
protected CamelContext createCamelContext() throws Exception {
@@ -76,17 +78,17 @@ public class ManagedComponentTest extends ManagementTestSupport {
ComponentVerifier.Result res;
// check lowercase
- res = invoke(mbeanServer, on, "verify", new Object[]{ "connectivity", Collections.emptyMap() }, VERIFY_SIGNATURE);
+ res = invoke(mbeanServer, on, "verify", new Object[]{"connectivity", Collections.emptyMap()}, VERIFY_SIGNATURE);
assertEquals(ComponentVerifier.Result.Status.OK, res.getStatus());
assertEquals(ComponentVerifier.Scope.CONNECTIVITY, res.getScope());
// check mixed case
- res = invoke(mbeanServer, on, "verify", new Object[]{ "ConnEctivIty", Collections.emptyMap() }, VERIFY_SIGNATURE);
+ res = invoke(mbeanServer, on, "verify", new Object[]{"ConnEctivIty", Collections.emptyMap()}, VERIFY_SIGNATURE);
assertEquals(ComponentVerifier.Result.Status.OK, res.getStatus());
assertEquals(ComponentVerifier.Scope.CONNECTIVITY, res.getScope());
// check uppercase
- res = invoke(mbeanServer, on, "verify", new Object[]{ "PARAMETERS", Collections.emptyMap() }, VERIFY_SIGNATURE);
+ res = invoke(mbeanServer, on, "verify", new Object[]{"PARAMETERS", Collections.emptyMap()}, VERIFY_SIGNATURE);
assertEquals(ComponentVerifier.Result.Status.OK, res.getStatus());
assertEquals(ComponentVerifier.Scope.PARAMETERS, res.getScope());
}
@@ -115,4 +117,4 @@ public class ManagedComponentTest extends ManagementTestSupport {
throw new UnsupportedOperationException();
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/7ba19021/camel-core/src/test/java/org/apache/camel/management/ManagementTestSupport.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagementTestSupport.java b/camel-core/src/test/java/org/apache/camel/management/ManagementTestSupport.java
index 1d484ec..ed0b372 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagementTestSupport.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagementTestSupport.java
@@ -47,7 +47,7 @@ public abstract class ManagementTestSupport extends ContextTestSupport {
}
@SuppressWarnings("unchecked")
- protected <T> T invoke(MBeanServer server, ObjectName name, String operationName,Object params[], String signature[])
+ protected <T> T invoke(MBeanServer server, ObjectName name, String operationName, Object params[], String signature[])
throws InstanceNotFoundException, MBeanException, ReflectionException {
return (T)server.invoke(name, operationName, params, signature);
}