You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2016/08/26 11:58:04 UTC
[1/3] camel git commit: Followup to CAMEL-8108
Repository: camel
Updated Branches:
refs/heads/master b571734d8 -> 0d35f4c0d
Followup to CAMEL-8108
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6692e938
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6692e938
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6692e938
Branch: refs/heads/master
Commit: 6692e9381b128189d98609470719b7448c6cb6a8
Parents: b571734
Author: Yoshiki Higo <yo...@gmail.com>
Authored: Wed Aug 24 15:42:12 2016 +0900
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri Aug 26 13:36:23 2016 +0200
----------------------------------------------------------------------
.../main/java/org/apache/camel/converter/jaxp/XmlConverter.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/6692e938/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
index cc6dbe6..70f4f87 100644
--- a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
@@ -289,7 +289,7 @@ public class XmlConverter {
*/
@Deprecated
public DOMSource toDOMSource(Source source) throws ParserConfigurationException, IOException, SAXException, TransformerException {
- return toDOMSource(source, (Exchange)null);
+ return toDOMSource(source, null);
}
/**
@@ -880,7 +880,7 @@ public class XmlConverter {
*/
@Deprecated
public Document toDOMDocument(InputSource in) throws IOException, SAXException, ParserConfigurationException {
- return toDOMDocument(in, (Exchange)null);
+ return toDOMDocument(in, null);
}
/**
[2/3] camel git commit: Followup to CAMEL-8072
Posted by ac...@apache.org.
Followup to CAMEL-8072
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/90ce8ab4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/90ce8ab4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/90ce8ab4
Branch: refs/heads/master
Commit: 90ce8ab426c3c091efc470f01346d1435edac58d
Parents: 6692e93
Author: Yoshiki Higo <yo...@gmail.com>
Authored: Wed Aug 24 17:15:59 2016 +0900
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri Aug 26 13:41:26 2016 +0200
----------------------------------------------------------------------
.../component/netty/http/handlers/HttpServerChannelHandler.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/90ce8ab4/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpServerChannelHandler.java
----------------------------------------------------------------------
diff --git a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpServerChannelHandler.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpServerChannelHandler.java
index a1d8a26..cf8936a 100644
--- a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpServerChannelHandler.java
+++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpServerChannelHandler.java
@@ -110,7 +110,8 @@ public class HttpServerChannelHandler extends ServerChannelHandler {
response.headers().set("Allow", s);
response.headers().set(Exchange.CONTENT_TYPE, "text/plain");
response.headers().set(Exchange.CONTENT_LENGTH, 0);
- messageEvent.getChannel().write(response);
+ messageEvent.getChannel().write(response).syncUninterruptibly();
+ messageEvent.getChannel().close();
return;
}
if (consumer.getEndpoint().getHttpMethodRestrict() != null
[3/3] camel git commit: Followup to CAMEL-7132
Posted by ac...@apache.org.
Followup to CAMEL-7132
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0d35f4c0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0d35f4c0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0d35f4c0
Branch: refs/heads/master
Commit: 0d35f4c0d1c8386a6755c59618ebf9de69847f4b
Parents: 90ce8ab
Author: Yoshiki Higo <yo...@gmail.com>
Authored: Wed Aug 24 17:45:45 2016 +0900
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri Aug 26 13:47:28 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/component/quartz2/QuartzComponent.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/0d35f4c0/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzComponent.java b/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzComponent.java
index 628adc9..99ec275 100644
--- a/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzComponent.java
+++ b/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzComponent.java
@@ -354,7 +354,7 @@ public class QuartzComponent extends UriEndpointComponent implements StartupList
group = host;
name = path;
} else {
- String camelContextName = getCamelContext().getManagementName();
+ String camelContextName = QuartzHelper.getQuartzContextName(getCamelContext());
group = camelContextName == null ? "Camel" : "Camel_" + camelContextName;
name = host;
}