Author: dkulp
Date: Fri Jul 8 19:47:07 2011
New Revision: 1144457
URL: http://svn.apache.org/viewvc?rev=1144457&view=rev
Log:
Merged revisions 1098032 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1098032 | joed | 2011-04-29 20:32:23 -0400 (Fri, 29 Apr 2011) | 3 lines
Do not create a new exchange and drop the headers.
CAMEL-3920
........
Added:
camel/branches/camel-2.7.x/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpHeaderTransferTest.java
- copied unchanged from r1098032,
camel/trunk/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsIpHeaderTransferTest.java
Modified:
camel/branches/camel-2.7.x/ (props changed)
camel/branches/camel-2.7.x/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsDigEndpoint.java
camel/branches/camel-2.7.x/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsIpEndpoint.java
camel/branches/camel-2.7.x/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsLookupEndpoint.java
camel/branches/camel-2.7.x/components/camel-dns/src/main/java/org/apache/camel/component/dns/WikipediaEndpoint.java
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 8 19:47:07 2011
@@ -1 +1 @@
-/camel/trunk:1083696,1083723-1083724,1084150,1085277,1085543,1085549,1085905,1085909,1086165,1086231,1087005,1087276,1087612,1087620,1087856,1088583,1088916-1088917,1089275,1089348,1090166,1090204,1090564,1090960-1090969,1091082,1091518,1091771,1091799,1092034,1092068,1092577,1092667,1093978,1093980,1093999,1094123,1094147,1094156,1095405,1095469,1095471,1095475-1095476,1096346,1096736,1097761,1097909,1097912,1097978,1098630,1099417,1100975,1102162,1102181,1104076,1124497,1127744,1127988,1131411,1134252,1134501,1135223,1135364,1136290,1138285,1139163,1140096-1140102,1141783,1143925,1144248,1144324
+/camel/trunk:1083696,1083723-1083724,1084150,1085277,1085543,1085549,1085905,1085909,1086165,1086231,1087005,1087276,1087612,1087620,1087856,1088583,1088916-1088917,1089275,1089348,1090166,1090204,1090564,1090960-1090969,1091082,1091518,1091771,1091799,1092034,1092068,1092577,1092667,1093978,1093980,1093999,1094123,1094147,1094156,1095405,1095469,1095471,1095475-1095476,1096346,1096736,1097761,1097909,1097912,1097978,1098032,1098630,1099417,1100975,1102162,1102181,1104076,1124497,1127744,1127988,1131411,1134252,1134501,1135223,1135364,1136290,1138285,1139163,1140096-1140102,1141783,1143925,1144248,1144324
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.7.x/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsDigEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsDigEndpoint.java?rev=1144457&r1=1144456&r2=1144457&view=diff
==============================================================================
---
camel/branches/camel-2.7.x/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsDigEndpoint.java
(original)
+++
camel/branches/camel-2.7.x/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsDigEndpoint.java
Fri Jul 8 19:47:07 2011
@@ -68,7 +68,7 @@ public class DnsDigEndpoint extends Defa
Record rec = Record.newRecord(name, type, dclass);
Message query = Message.newQuery(rec);
Message response = resolver.send(query);
- exchange.getOut().setBody(response);
+ exchange.getIn().setBody(response);
}
};
}
@@ -76,5 +76,4 @@ public class DnsDigEndpoint extends Defa
public boolean isSingleton() {
return false;
}
-
}
Modified:
camel/branches/camel-2.7.x/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsIpEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsIpEndpoint.java?rev=1144457&r1=1144456&r2=1144457&view=diff
==============================================================================
---
camel/branches/camel-2.7.x/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsIpEndpoint.java
(original)
+++
camel/branches/camel-2.7.x/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsIpEndpoint.java
Fri Jul 8 19:47:07 2011
@@ -45,7 +45,7 @@ public class DnsIpEndpoint extends Defau
ObjectHelper.notEmpty(domain, "Header " +
DnsConstants.DNS_DOMAIN);
InetAddress address = Address.getByName(domain);
- exchange.getOut().setBody(address);
+ exchange.getIn().setBody(address);
}
};
}
@@ -57,5 +57,4 @@ public class DnsIpEndpoint extends Defau
public boolean isSingleton() {
return false;
}
-
}
Modified:
camel/branches/camel-2.7.x/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsLookupEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsLookupEndpoint.java?rev=1144457&r1=1144456&r2=1144457&view=diff
==============================================================================
---
camel/branches/camel-2.7.x/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsLookupEndpoint.java
(original)
+++
camel/branches/camel-2.7.x/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsLookupEndpoint.java
Fri Jul 8 19:47:07 2011
@@ -71,9 +71,9 @@ public class DnsLookupEndpoint extends D
lookup.run();
if (lookup.getAnswers() != null) {
- exchange.getOut().setBody(lookup.getAnswers());
+ exchange.getIn().setBody(lookup.getAnswers());
} else {
- exchange.getOut().setBody(lookup.getErrorString());
+ exchange.getIn().setBody(lookup.getErrorString());
}
}
};
@@ -82,5 +82,4 @@ public class DnsLookupEndpoint extends D
public boolean isSingleton() {
return false;
}
-
}
Modified:
camel/branches/camel-2.7.x/components/camel-dns/src/main/java/org/apache/camel/component/dns/WikipediaEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-dns/src/main/java/org/apache/camel/component/dns/WikipediaEndpoint.java?rev=1144457&r1=1144456&r2=1144457&view=diff
==============================================================================
---
camel/branches/camel-2.7.x/components/camel-dns/src/main/java/org/apache/camel/component/dns/WikipediaEndpoint.java
(original)
+++
camel/branches/camel-2.7.x/components/camel-dns/src/main/java/org/apache/camel/component/dns/WikipediaEndpoint.java
Fri Jul 8 19:47:07 2011
@@ -62,9 +62,9 @@ public class WikipediaEndpoint extends D
Message response = resolver.send(query);
Record[] records = response.getSectionArray(Section.ANSWER);
if (records.length > 0) {
- exchange.getOut().setBody(records[0].rdataToString());
+ exchange.getIn().setBody(records[0].rdataToString());
} else {
- exchange.getOut().setBody(null);
+ exchange.getIn().setBody(null);
}
}
};
@@ -73,5 +73,4 @@ public class WikipediaEndpoint extends D
public boolean isSingleton() {
return false;
}
-
}
