Author: ningjiang
Date: Mon Sep 5 04:01:57 2011
New Revision: 1165158
URL: http://svn.apache.org/viewvc?rev=1165158&view=rev
Log:
Merged revisions 1165152 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1165152 | ningjiang | 2011-09-05 10:50:01 +0800 (Mon, 05 Sep 2011) | 1 line
CAMEL-4410 fixed the test errors of camel-gae
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-gae/src/main/java/org/apache/camel/component/gae/http/GHttpEndpoint.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 5 04:01:57 2011
@@ -1 +1 @@
-/camel/trunk:1148706,1148710,1149570,1150651,1151000,1151054,1151087,1151362,1152170,1152755,1153620,1153812,1153829,1154684,1155230,1156108,1156260,1156277,1156479,1156524,1157348,1157749,1157798,1157831,1157878,1158153,1159171,1159174,1159326,1159457,1159460,1159606,1159682-1159683,1159867,1160547,1160637,1161010,1161082,1161524,1162309,1162395,1163420,1164557,1164633,1164973-1165000
+/camel/trunk:1148706,1148710,1149570,1150651,1151000,1151054,1151087,1151362,1152170,1152755,1153620,1153812,1153829,1154684,1155230,1156108,1156260,1156277,1156479,1156524,1157348,1157749,1157798,1157831,1157878,1158153,1159171,1159174,1159326,1159457,1159460,1159606,1159682-1159683,1159867,1160547,1160637,1161010,1161082,1161524,1162309,1162395,1163420,1164557,1164633,1164973-1165000,1165152
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.8.x/components/camel-gae/src/main/java/org/apache/camel/component/gae/http/GHttpEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-gae/src/main/java/org/apache/camel/component/gae/http/GHttpEndpoint.java?rev=1165158&r1=1165157&r2=1165158&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/components/camel-gae/src/main/java/org/apache/camel/component/gae/http/GHttpEndpoint.java
(original)
+++
camel/branches/camel-2.8.x/components/camel-gae/src/main/java/org/apache/camel/component/gae/http/GHttpEndpoint.java
Mon Sep 5 04:01:57 2011
@@ -66,7 +66,8 @@ public class GHttpEndpoint extends Servl
URI httpUri, HttpClientParams params,
HttpConnectionManager httpConnectionManager,
HttpClientConfigurer clientConfigurer) throws URISyntaxException {
- super(endpointUri, component, httpUri, params, httpConnectionManager,
clientConfigurer);
+ // set the endpoint uri with httpUri as we need to create http
producer here
+ super(httpUri.toString(), component, httpUri, params,
httpConnectionManager, clientConfigurer);
urlFetchService = URLFetchServiceFactory.getURLFetchService();
}
@@ -147,4 +148,10 @@ public class GHttpEndpoint extends Servl
return new GHttpProducer(this);
}
+ @Override
+ public boolean isLenientProperties() {
+ // GHttpEndpoint knows about all it's options on the passed URI
+ return true;
+ }
+
}