camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r721816 - in /activemq/camel/branches/camel-1.x: ./ components/camel-http/src/main/java/org/apache/camel/component/http/ components/camel-jetty/src/test/java/org/apache/camel/component/jetty/
Date Sun, 30 Nov 2008 14:08:48 GMT
Author: davsclaus
Date: Sun Nov 30 06:08:48 2008
New Revision: 721816

URL: http://svn.apache.org/viewvc?rev=721816&view=rev
Log:
Merged revisions 721813 via svnmerge from 
https://svn.apache.org/repos/asf/activemq/camel/trunk

........
  r721813 | davsclaus | 2008-11-30 15:03:57 +0100 (so, 30 nov 2008) | 1 line
  
  CAMEL-1119: Applied 2nd patch with thanks to Trev.
........

Modified:
    activemq/camel/branches/camel-1.x/   (props changed)
    activemq/camel/branches/camel-1.x/components/camel-http/src/main/java/org/apache/camel/component/http/HttpOperationFailedException.java
    activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyResponseBodyWhenErrorTest.java

Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 30 06:08:48 2008
@@ -1 +1 @@
-/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713136,713273,713290,713292,713295,713314,713475,713625,713932,713944,714032,717965,717989,718242,718273,718312-718515,719163-719184,719334,719339,719524,719662,719848,719851,719855,719864,719978-719979,720207,720435-720437,720806,721272,721331,721333-721334,721360,721669,721764
+/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713136,713273,713290,713292,713295,713314,713475,713625,713932,713944,714032,717965,717989,718242,718273,718312-718515,719163-719184,719334,719339,719524,719662,719848,719851,719855,719864,719978-719979,720207,720435-720437,720806,721272,721331,721333-721334,721360,721669,721764,721813

Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: activemq/camel/branches/camel-1.x/components/camel-http/src/main/java/org/apache/camel/component/http/HttpOperationFailedException.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-http/src/main/java/org/apache/camel/component/http/HttpOperationFailedException.java?rev=721816&r1=721815&r2=721816&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/components/camel-http/src/main/java/org/apache/camel/component/http/HttpOperationFailedException.java
(original)
+++ activemq/camel/branches/camel-1.x/components/camel-http/src/main/java/org/apache/camel/component/http/HttpOperationFailedException.java
Sun Nov 30 06:08:48 2008
@@ -27,20 +27,20 @@
     private final String redirectLocation;
     private final int statusCode;
     private final StatusLine statusLine;
-    private final Header[] headers;
+    private final Header[] responseHeaders;
     private final InputStream responseBody;
 
-    public HttpOperationFailedException(int statusCode, StatusLine statusLine, String location,
Header[] headers, InputStream responseBody) {
+    public HttpOperationFailedException(int statusCode, StatusLine statusLine, String location,
Header[] responseHeaders, InputStream responseBody) {
         super("HTTP operation failed with statusCode: " + statusCode + ", status: " + statusLine
+ (location != null ? ", redirectLocation: " + location : ""));
         this.statusCode = statusCode;
         this.statusLine = statusLine;
         this.redirectLocation = location;
-        this.headers = headers;
+        this.responseHeaders = responseHeaders;
         this.responseBody = responseBody;
     }
 
-    public HttpOperationFailedException(int statusCode, StatusLine statusLine, Header[] headers,
InputStream responseBody) {
-        this(statusCode, statusLine, null, headers, responseBody);
+    public HttpOperationFailedException(int statusCode, StatusLine statusLine, Header[] responseHeaders,
InputStream responseBody) {
+        this(statusCode, statusLine, null, responseHeaders, responseBody);
     }
 
     public boolean isRedirectError() {
@@ -63,12 +63,12 @@
         return statusCode;
     }
 
-    public Header[] getHeaders() {
-        return headers;
+    public Header[] getResponseHeaders() {
+        return responseHeaders;
     }
 
     public InputStream getResponseBody() {
         return responseBody;
     }
-   
+
 }
\ No newline at end of file

Modified: activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyResponseBodyWhenErrorTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyResponseBodyWhenErrorTest.java?rev=721816&r1=721815&r2=721816&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyResponseBodyWhenErrorTest.java
(original)
+++ activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyResponseBodyWhenErrorTest.java
Sun Nov 30 06:08:48 2008
@@ -38,8 +38,8 @@
             String body = context.getTypeConverter().convertTo(String.class, cause.getResponseBody());
             assertTrue(body.indexOf("Damm") > -1);
             assertTrue(body.indexOf("IllegalArgumentException") > -1);
-            assertNotNull(cause.getHeaders());
-            assertTrue("Should have http header with content type set", cause.getHeaders()[0].getValue().indexOf("text/plain")
> -1);
+            assertNotNull(cause.getResponseHeaders());
+            assertTrue("Should have http header with content type set", cause.getResponseHeaders()[0].getValue().indexOf("text/plain")
> -1);
         }
     }
 



Mime
View raw message