Author: norman
Date: Thu Nov 30 00:43:26 2006
New Revision: 480878
URL: http://svn.apache.org/viewvc?view=rev&rev=480878
Log:
Get sure we use everytime the defaultdomain. See JAMES-719
Modified:
james/server/trunk/src/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java
james/server/trunk/src/java/org/apache/james/vut/AbstractVirtualUserTable.java
Modified:
james/server/trunk/src/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java?view=diff&rev=480878&r1=480877&r2=480878
==============================================================================
---
james/server/trunk/src/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java
(original)
+++
james/server/trunk/src/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java
Thu Nov 30 00:43:26 2006
@@ -177,13 +177,19 @@
throw new MessagingException(errorBuffer.toString());
}
- // TODO: what to do when mappings return null?
if (mappings != null) {
Iterator i = mappings.iterator();
Collection remoteRecipients = new ArrayList();
Collection localRecipients = new ArrayList();
while (i.hasNext()) {
- MailAddress nextMap = new MailAddress((String) i.next());
+ String rcpt = (String) i.next();
+
+ if (rcpt.indexOf("@") < 0) {
+ // the mapping contains no domain name, use the
default domain
+ rcpt = rcpt + "@" +
getMailetContext().getAttribute(Constants.DEFAULT_DOMAIN);
+ }
+
+ MailAddress nextMap = new MailAddress(rcpt);
if (getMailetContext().isLocalServer(nextMap.getHost())) {
localRecipients.add(nextMap);
} else {
Modified:
james/server/trunk/src/java/org/apache/james/vut/AbstractVirtualUserTable.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/vut/AbstractVirtualUserTable.java?view=diff&rev=480878&r1=480877&r2=480878
==============================================================================
---
james/server/trunk/src/java/org/apache/james/vut/AbstractVirtualUserTable.java
(original)
+++
james/server/trunk/src/java/org/apache/james/vut/AbstractVirtualUserTable.java
Thu Nov 30 00:43:26 2006
@@ -95,12 +95,18 @@
if (targetAddress == null) continue;
}
-
+
+ /* The VirtualUserTable not know anything about the
defaultDomain. The defaultDomain should be added by the service which use
+ * the VirtualUserTable
+ *
if (targetAddress.indexOf('@') < 0) {
target = targetAddress + "@localhost";
} else {
target = targetAddress;
}
+ */
+
+ target = targetAddress;
// add mapping
mappings.add(target);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
