summaryrefslogtreecommitdiffstats
path: root/base/common
diff options
context:
space:
mode:
authorEndi S. Dewata <edewata@redhat.com>2017-06-14 03:40:43 +0200
committerEndi S. Dewata <edewata@redhat.com>2017-06-14 05:54:46 +0200
commit4a8e1703603ab348b24d4f010e3587c340e1a032 (patch)
treeb41697d3f316e3c12a5124b9e280f7b50e643de7 /base/common
parente5f6ed7be301a3531b871ef3b0ce64bea0fe1973 (diff)
downloadpki-4a8e1703603ab348b24d4f010e3587c340e1a032.tar.gz
pki-4a8e1703603ab348b24d4f010e3587c340e1a032.tar.xz
pki-4a8e1703603ab348b24d4f010e3587c340e1a032.zip
Fixed access banner encoding (part 2).
The code that reads the access banner from file has been modified to explicitly use UTF-8 encoding. The Info class and the PKI UI have been modified not to encode the access banner in Base64 since it is not necessary. https://pagure.io/dogtagpki/issue/2671 Change-Id: I5f41a8ebac0bc91623b27f14608bca294bc9bc38
Diffstat (limited to 'base/common')
-rw-r--r--base/common/src/org/dogtagpki/common/Info.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/base/common/src/org/dogtagpki/common/Info.java b/base/common/src/org/dogtagpki/common/Info.java
index 7ea3fd73a..0a216f434 100644
--- a/base/common/src/org/dogtagpki/common/Info.java
+++ b/base/common/src/org/dogtagpki/common/Info.java
@@ -26,7 +26,6 @@ import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -67,7 +66,6 @@ public class Info extends ResourceMessage {
}
@XmlElement(name="Banner")
- @XmlJavaTypeAdapter(Base64Adapter.class)
public String getBanner() {
return banner;
}