Author: norman
Date: Mon Oct 26 14:20:25 2009
New Revision: 829810
URL: http://svn.apache.org/viewvc?rev=829810&view=rev
Log:
Better handling of configure error
Modified:
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/ValidRcptHandler.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
Modified:
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/ValidRcptHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/ValidRcptHandler.java?rev=829810&r1=829809&r2=829810&view=diff
==============================================================================
---
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/ValidRcptHandler.java
(original)
+++
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/ValidRcptHandler.java
Mon Oct 26 14:20:25 2009
@@ -23,6 +23,7 @@
import java.util.Collection;
import java.util.Iterator;
+import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import org.apache.commons.configuration.Configuration;
@@ -95,6 +96,10 @@
@Resource(name = "org.apache.james.api.vut.VirtualUserTableStore")
public final void setTableStore(VirtualUserTableStore tableStore) {
this.tableStore = tableStore;
+ }
+
+ @PostConstruct
+ public void init() throws Exception{
loadTable();
}
@@ -169,16 +174,18 @@
public void setTableName(String tableName) {
this.tableName = tableName;
- loadTable();
}
- private void loadTable() {
+ private void loadTable() throws Exception {
if (this.tableName == null || this.tableName.equals("")) {
this.tableName = VirtualUserTableStore.DEFAULT_TABLE;
}
if (tableStore != null) {
table = tableStore.getTable(this.tableName);
}
+ if (table == null) {
+ throw new Exception("Unable to find VirtualUserTable
with name " + tableName);
+ }
}
Modified:
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java?rev=829810&r1=829809&r2=829810&view=diff
==============================================================================
---
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
(original)
+++
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
Mon Oct 26 14:20:25 2009
@@ -60,6 +60,7 @@
handler = new ValidRcptHandler();
handler.setUsers(users);
handler.setTableStore(setUpVirtualUserTableStore());
+ handler.init();
}
private SMTPSession setupMockedSMTPSession(final SMTPConfiguration conf,
final MailAddress rcpt, final boolean relayingAllowed) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
