--- a/artifact-database/src/main/java/de/intevation/artifactdatabase/Config.java	Thu Sep 10 08:57:09 2009 +0000
+++ b/artifact-database/src/main/java/de/intevation/artifactdatabase/Config.java	Thu Sep 10 09:23:53 2009 +0000
@@ -10,12 +10,10 @@
 import org.xml.sax.SAXException;
 
 import javax.xml.parsers.DocumentBuilderFactory;
-
 import javax.xml.parsers.ParserConfigurationException;
 
 import javax.xml.namespace.QName;
 
-import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathConstants;
 
 import org.apache.log4j.Logger;
@@ -95,22 +93,11 @@
     public static final Object getXPath(
         Object root, String query, QName returnType
     ) {
-        if (root == null) {
-            return null;
-        }
-
-        try {
-            return XMLUtils.newXPath().evaluate(query, root, returnType);
-        }
-        catch (XPathExpressionException xpee) {
-            logger.error(xpee.getLocalizedMessage(), xpee);
-        }
-
-        return null;
+        return XMLUtils.xpath(root, query, returnType);
     }
 
     public static final Object getXPath(String query, QName returnType) {
-        return getXPath(getConfig(), query, returnType);
+        return XMLUtils.xpath(getConfig(), query, returnType);
     }
 
     public static final NodeList getNodeSetXPath(String query) {