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 2011/10/28 11:07:23 UTC
svn commit: r1190216 - in /camel/branches/camel-2.8.x: ./
components/camel-atom/src/main/java/org/apache/camel/component/atom/
Author: ningjiang
Date: Fri Oct 28 09:07:23 2011
New Revision: 1190216
URL: http://svn.apache.org/viewvc?rev=1190216&view=rev
Log:
Merged revisions 1190212-1190213 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1190212 | ningjiang | 2011-10-28 16:56:17 +0800 (Fri, 28 Oct 2011) | 1 line
CAMEL-4592 AtomUtils.parseDocument() should be set with right TCCL
........
r1190213 | ningjiang | 2011-10-28 16:57:00 +0800 (Fri, 28 Oct 2011) | 1 line
CAMEL-4592 revert the change of upgrading the abdera vesion, as it is not released yet
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEntryPollingConsumer.java
camel/branches/camel-2.8.x/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomPollingConsumer.java
camel/branches/camel-2.8.x/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomUtils.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 28 09:07:23 2011
@@ -1 +1 @@
-/camel/trunk:1186106,1186625,1186772,1187221,1187485,1187882,1187893,1188070-1188085,1188642,1188674,1188879,1188881,1189600,1189681,1189693,1189737
+/camel/trunk:1186106,1186625,1186772,1187221,1187485,1187882,1187893,1188070-1188085,1188642,1188674,1188879,1188881,1189600,1189681,1189693,1189737,1190212-1190213
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEntryPollingConsumer.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEntryPollingConsumer.java?rev=1190216&r1=1190215&r2=1190216&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEntryPollingConsumer.java (original)
+++ camel/branches/camel-2.8.x/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEntryPollingConsumer.java Fri Oct 28 09:07:23 2011
@@ -43,16 +43,7 @@ public class AtomEntryPollingConsumer ex
private Document<Feed> getDocument() throws IOException, ParseException {
if (document == null) {
- ClassLoader old = Thread.currentThread().getContextClassLoader();
- try {
- if (endpoint.getCamelContext().getApplicationContextClassLoader() != null) {
- Thread.currentThread().setContextClassLoader(endpoint.getCamelContext().getApplicationContextClassLoader());
- LOG.debug("set the TCCL to be " + endpoint.getCamelContext().getApplicationContextClassLoader());
- }
- document = AtomUtils.parseDocument(endpoint.getFeedUri());
- } finally {
- Thread.currentThread().setContextClassLoader(old);
- }
+ document = AtomUtils.parseDocument(endpoint.getFeedUri());
Feed root = document.getRoot();
if (endpoint.isSortEntries()) {
sortEntries(root);
Modified: camel/branches/camel-2.8.x/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomPollingConsumer.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomPollingConsumer.java?rev=1190216&r1=1190215&r2=1190216&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomPollingConsumer.java (original)
+++ camel/branches/camel-2.8.x/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomPollingConsumer.java Fri Oct 28 09:07:23 2011
@@ -39,16 +39,9 @@ public class AtomPollingConsumer extends
@Override
protected Object createFeed() throws IOException {
- ClassLoader old = Thread.currentThread().getContextClassLoader();
- try {
- if (endpoint.getCamelContext().getApplicationContextClassLoader() != null) {
- Thread.currentThread().setContextClassLoader(endpoint.getCamelContext().getApplicationContextClassLoader());
- LOG.debug("set the TCCL to be " + endpoint.getCamelContext().getApplicationContextClassLoader());
- }
- Document<Feed> document = AtomUtils.parseDocument(endpoint.getFeedUri());
- return document.getRoot();
- } finally {
- Thread.currentThread().setContextClassLoader(old);
- }
+
+ Document<Feed> document = AtomUtils.parseDocument(endpoint.getFeedUri());
+ return document.getRoot();
+
}
}
Modified: camel/branches/camel-2.8.x/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomUtils.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomUtils.java?rev=1190216&r1=1190215&r2=1190216&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomUtils.java (original)
+++ camel/branches/camel-2.8.x/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomUtils.java Fri Oct 28 09:07:23 2011
@@ -52,7 +52,16 @@ public final class AtomUtils {
*/
public static Document<Feed> parseDocument(String uri) throws IOException, ParseException {
InputStream in = new URL(uri).openStream();
- return getAtomParser().parse(in);
+ Parser parser = getAtomParser();
+ // set the thread context loader with the ParserClassLoader
+ ClassLoader old = Thread.currentThread().getContextClassLoader();
+ try {
+ Thread.currentThread().setContextClassLoader(parser.getClass().getClassLoader());
+ return parser.parse(in);
+ } finally {
+ Thread.currentThread().setContextClassLoader(old);
+ }
+
}
}