diff options
| author | Damian Minkov <damencho@jitsi.org> | 2014-06-12 15:42:09 +0300 |
|---|---|---|
| committer | Damian Minkov <damencho@jitsi.org> | 2014-06-12 15:42:09 +0300 |
| commit | 965f6b6f5992610a5cd418833169fd01fab65144 (patch) | |
| tree | e2505860ebff969071caf86a8edd6920bd8b39d6 /src/net/java/sip/communicator/impl/history | |
| parent | 2482a0b91fe2d877dfbd6f343f2ead0cc310149c (diff) | |
| download | jitsi-965f6b6f5992610a5cd418833169fd01fab65144.zip jitsi-965f6b6f5992610a5cd418833169fd01fab65144.tar.gz jitsi-965f6b6f5992610a5cd418833169fd01fab65144.tar.bz2 | |
Unescape in history reader, the escaped chars that were written by history writer.
Diffstat (limited to 'src/net/java/sip/communicator/impl/history')
| -rw-r--r-- | src/net/java/sip/communicator/impl/history/HistoryReaderImpl.java | 4 | ||||
| -rw-r--r-- | src/net/java/sip/communicator/impl/history/history.manifest.mf | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/net/java/sip/communicator/impl/history/HistoryReaderImpl.java b/src/net/java/sip/communicator/impl/history/HistoryReaderImpl.java index 3c872e7..15c1e8e 100644 --- a/src/net/java/sip/communicator/impl/history/HistoryReaderImpl.java +++ b/src/net/java/sip/communicator/impl/history/HistoryReaderImpl.java @@ -17,6 +17,7 @@ import net.java.sip.communicator.service.history.*; import net.java.sip.communicator.service.history.event.*; import net.java.sip.communicator.service.history.records.*; +import org.apache.commons.lang3.*; import org.w3c.dom.*; /** @@ -688,6 +689,9 @@ public class HistoryReaderImpl // Get nested TEXT node's value String nodeValue = nestedNode.getNodeValue(); + // unescape xml chars, we have escaped when writing values + nodeValue = StringEscapeUtils.unescapeXml(nodeValue); + if(field != null && field.equals(nodeName)) { targetNodeFound = true; diff --git a/src/net/java/sip/communicator/impl/history/history.manifest.mf b/src/net/java/sip/communicator/impl/history/history.manifest.mf index 9918d34..d09d128 100644 --- a/src/net/java/sip/communicator/impl/history/history.manifest.mf +++ b/src/net/java/sip/communicator/impl/history/history.manifest.mf @@ -12,6 +12,7 @@ Import-Package: org.osgi.framework, net.java.sip.communicator.service.history.records, com.google.common.escape, com.google.common.xml, + org.apache.commons.lang3, org.w3c.dom, org.xml.sax, javax.xml.parsers, |