Author: norman
Date: Mon Jan 25 12:24:26 2010
New Revision: 902792
URL: http://svn.apache.org/viewvc?rev=902792&view=rev
Log:
replace deprecated methods
Modified:
james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/MessageProcessor.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AbstractRedirect.java
Modified:
james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/MessageProcessor.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/MessageProcessor.java?rev=902792&r1=902791&r2=902792&view=diff
==============================================================================
---
james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/MessageProcessor.java
(original)
+++
james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/MessageProcessor.java
Mon Jan 25 12:24:26 2010
@@ -897,10 +897,9 @@
* @param recipient
* @return boolean
*/
- @SuppressWarnings("deprecation")
protected boolean isLocalServer(MailAddress recipient)
{
- return getServer().isLocalServer(recipient.getHost());
+ return getServer().isLocalServer(recipient.getDomain());
}
/**
Modified:
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AbstractRedirect.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AbstractRedirect.java?rev=902792&r1=902791&r2=902792&view=diff
==============================================================================
---
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AbstractRedirect.java
(original)
+++
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AbstractRedirect.java
Mon Jan 25 12:24:26 2010
@@ -1360,7 +1360,7 @@
*/
protected final boolean senderDomainIsValid(Mail mail) throws
MessagingException {
if (getFakeDomainCheck(mail)) {
- return mail.getSender() == null ||
getMailetContext().getMailServers(mail.getSender().getHost()).size() != 0;
+ return mail.getSender() == null ||
getMailetContext().getMailServers(mail.getSender().getDomain()).size() != 0;
} else return true;
}
@@ -1470,7 +1470,7 @@
Iterator iterator = list.iterator();
while (iterator.hasNext()) {
MailAddress mailAddress = (MailAddress) iterator.next();
- if (!mailAddress.getHost().equalsIgnoreCase("address.marker")) {
+ if (!mailAddress.getDomain().equalsIgnoreCase("address.marker")) {
newList.add(mailAddress);
} else if (mailAddress == SpecialAddress.SENDER || mailAddress ==
SpecialAddress.FROM) {
MailAddress sender = mail.getSender();
@@ -1540,7 +1540,7 @@
while (iterator.hasNext()) {
InternetAddress internetAddress = (InternetAddress)
iterator.next();
MailAddress mailAddress = new MailAddress(internetAddress);
- if (!mailAddress.getHost().equalsIgnoreCase("address.marker")) {
+ if (!mailAddress.getDomain().equalsIgnoreCase("address.marker")) {
newList.add(internetAddress);
} else if
(internetAddress.equals(SpecialAddress.SENDER.toInternetAddress())) {
MailAddress sender = mail.getSender();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
