From 0c700829c48c112417c5ef3e37e014cbc84c0c3e Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Tue, 14 Sep 2010 09:25:00 +0000
Subject: [PATCH] LMS-1747 using the right StringEscapeUtils class
SVN: 17823
---
.../client/web/server/calculator/StandardFunctions.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/StandardFunctions.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/StandardFunctions.java
index 5b993edade1..92c872ea65d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/StandardFunctions.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/StandardFunctions.java
@@ -27,11 +27,11 @@ import javax.xml.xpath.XPathExpression;
import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathFactory;
+import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.StringUtils;
import org.xml.sax.InputSource;
import ch.systemsx.cisd.common.utilities.ExceptionUtils;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.lang.StringEscapeUtils;
/**
* Set of standard functions used in jython expressions.
@@ -63,7 +63,7 @@ final class StandardFunctions
try
{
XPathExpression expression = XPATH.compile(xPath);
- String str = StringEscapeUtils.unescapeHtml(xmlString);
+ String str = StringEscapeUtils.unescapeXml(xmlString);
String result = expression.evaluate(new InputSource(new StringReader(str)));
return result;
} catch (XPathExpressionException ex)
--
GitLab