You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2013/07/31 08:38:14 UTC
[1/2] git commit: CAMEL-6590 Fixed Restlet header warnings with
thanks to David
Updated Branches:
refs/heads/master 08f03d17d -> e7db4ab26
CAMEL-6590 Fixed Restlet header warnings with thanks to David
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e7db4ab2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e7db4ab2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e7db4ab2
Branch: refs/heads/master
Commit: e7db4ab26749904a4d0ea0b6a0faadfa62519845
Parents: d8ec669
Author: Willem Jiang <ni...@apache.org>
Authored: Wed Jul 31 14:22:21 2013 +0800
Committer: Willem Jiang <ni...@apache.org>
Committed: Wed Jul 31 14:27:35 2013 +0800
----------------------------------------------------------------------
.../camel/component/restlet/RestletHeaderFilterStrategy.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e7db4ab2/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletHeaderFilterStrategy.java
----------------------------------------------------------------------
diff --git a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletHeaderFilterStrategy.java b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletHeaderFilterStrategy.java
index 62f44a1..a269169 100644
--- a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletHeaderFilterStrategy.java
+++ b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletHeaderFilterStrategy.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.restlet;
import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultHeaderFilterStrategy;
+import org.restlet.engine.http.header.HeaderConstants;
/**
* Default header filtering strategy for Restlet
@@ -37,6 +38,8 @@ public class RestletHeaderFilterStrategy extends DefaultHeaderFilterStrategy {
// The "CamelAcceptContentType" header is not added to the outgoing HTTP
// headers but it will be going out as "Accept.
getOutFilter().add(Exchange.ACCEPT_CONTENT_TYPE);
-
+
+ // Remove the restlet headers from the out message.
+ getOutFilter().add(HeaderConstants.ATTRIBUTE_HEADERS);
}
}
[2/2] git commit: CAMEL-6592 fixed the Javadoc issue of
org.apache.camel.spi.ShutdownStrategy#setTimeout
Posted by ni...@apache.org.
CAMEL-6592 fixed the Javadoc issue of org.apache.camel.spi.ShutdownStrategy#setTimeout
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d8ec6690
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d8ec6690
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d8ec6690
Branch: refs/heads/master
Commit: d8ec66900b7931b8c76b96d73e92e48895914c4e
Parents: 08f03d1
Author: Willem Jiang <ni...@apache.org>
Authored: Wed Jul 31 11:30:21 2013 +0800
Committer: Willem Jiang <ni...@apache.org>
Committed: Wed Jul 31 14:27:35 2013 +0800
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/spi/ShutdownStrategy.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d8ec6690/camel-core/src/main/java/org/apache/camel/spi/ShutdownStrategy.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/spi/ShutdownStrategy.java b/camel-core/src/main/java/org/apache/camel/spi/ShutdownStrategy.java
index c1e7632..b063304 100644
--- a/camel-core/src/main/java/org/apache/camel/spi/ShutdownStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/spi/ShutdownStrategy.java
@@ -121,7 +121,7 @@ public interface ShutdownStrategy extends StaticService {
/**
* Gets the timeout.
* <p/>
- * Use 0 or a negative value to disable timeout
+ * Use positive value to set the timeout
* <p/>
* The default timeout unit is <tt>SECONDS</tt>
*