Author: bago
Date: Thu Oct 8 16:00:28 2009
New Revision: 823215
URL: http://svn.apache.org/viewvc?rev=823215&view=rev
Log:
Remove workaround for dnsjava <= 2.0.6 as dnsjava 2.0.7 has been released and
included in jDKIM (JDKIM-7)
Modified:
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/DNSPublicKeyRecordRetriever.java
Modified:
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/DNSPublicKeyRecordRetriever.java
URL:
http://svn.apache.org/viewvc/james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/DNSPublicKeyRecordRetriever.java?rev=823215&r1=823214&r2=823215&view=diff
==============================================================================
---
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/DNSPublicKeyRecordRetriever.java
(original)
+++
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/DNSPublicKeyRecordRetriever.java
Thu Oct 8 16:00:28 2009
@@ -80,17 +80,18 @@
case Type.TXT:
TXTRecord txt = (TXTRecord) rr[i];
if (txt.getStrings().size() == 1) {
- // TODO we need a better fix for this, like using
getStringsAsByteArray
- // it's not clear whether this is a bug in
dnsjava or not.
-
records.add(((String)txt.getStrings().get(0)).replaceAll("\\\\", ""));
+ // This was required until dnsjava 2.0.6 because
dnsjava was escaping
+ // the result like it was doublequoted
(JDKIM-7).
+ //
records.add(((String)txt.getStrings().get(0)).replaceAll("\\\\", ""));
+ records.add(((String)txt.getStrings().get(0)));
} else {
StringBuffer sb = new StringBuffer();
for (Iterator/* String */ it =
txt.getStrings().iterator(); it
.hasNext();) {
String k = (String) it.next();
- // TODO we need a better fix for this, like
using getStringsAsByteArray
- // it's not clear whether this is a bug in
dnsjava or not.
- k = k.replaceAll("\\\\", "");
+ // This was required until dnsjava 2.0.6
because dnsjava was escaping
+ // the result like it was doublequoted
(JDKIM-7).
+ // k = k.replaceAll("\\\\", "");
sb.append(k);
}
records.add(sb.toString());
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
