You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/12/10 11:16:07 UTC
svn commit: r1419319 - in /camel/branches/camel-2.9.x: ./
camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
Author: davsclaus
Date: Mon Dec 10 10:16:06 2012
New Revision: 1419319
URL: http://svn.apache.org/viewvc?rev=1419319&view=rev
Log:
CAMEL-5838: XPathBuilder. Extend ServiceSupport for better lifecycle handling.
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1419305
Merged /camel/branches/camel-2.10.x:r1419316
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java?rev=1419319&r1=1419318&r2=1419319&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java (original)
+++ camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java Mon Dec 10 10:16:06 2012
@@ -50,13 +50,12 @@ import org.apache.camel.Expression;
import org.apache.camel.NoTypeConversionAvailableException;
import org.apache.camel.Predicate;
import org.apache.camel.RuntimeExpressionException;
-import org.apache.camel.Service;
import org.apache.camel.WrappedFile;
import org.apache.camel.component.bean.BeanInvocation;
import org.apache.camel.impl.DefaultExchange;
import org.apache.camel.spi.Language;
import org.apache.camel.spi.NamespaceAware;
-import org.apache.camel.support.SynchronizationAdapter;
+import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.ExchangeHelper;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.MessageHelper;
@@ -82,7 +81,7 @@ import static org.apache.camel.builder.x
*
* @see XPathConstants#NODESET
*/
-public class XPathBuilder implements Expression, Predicate, NamespaceAware, Service {
+public class XPathBuilder extends ServiceSupport implements Expression, Predicate, NamespaceAware {
private static final transient Logger LOG = LoggerFactory.getLogger(XPathBuilder.class);
private static final String SAXON_OBJECT_MODEL_URI = "http://saxon.sf.net/jaxp/xpath/om";
private static final String OBTAIN_ALL_NS_XPATH = "//*/namespace::*";
@@ -1003,7 +1002,8 @@ public class XPathBuilder implements Exp
return variableResolver;
}
- public void start() throws Exception {
+ @Override
+ public void doStart() throws Exception {
if (xpathFactory == null) {
initDefaultXPathFactory();
}
@@ -1017,7 +1017,8 @@ public class XPathBuilder implements Exp
getSimpleFunction();
}
- public void stop() throws Exception {
+ @Override
+ public void doStop() throws Exception {
pool.clear();
poolTraceNamespaces.clear();
}