You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2003/10/19 22:22:50 UTC

cvs commit: james-server/src/java/org/apache/james/transport/mailets CommandListservProcessor.java

noel        2003/10/19 13:22:50

  Modified:    src/java/org/apache/james/transport/mailets Tag:
                        branch_2_1_fcs CommandListservProcessor.java
  Log:
  Fixed Bug 23917.  Generally improved exception reporting.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.1.2.3   +13 -21    james-server/src/java/org/apache/james/transport/mailets/Attic/CommandListservProcessor.java
  
  Index: CommandListservProcessor.java
  ===================================================================
  RCS file: /home/cvs/james-server/src/java/org/apache/james/transport/mailets/Attic/CommandListservProcessor.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- CommandListservProcessor.java	6 Jul 2003 11:53:55 -0000	1.1.2.2
  +++ CommandListservProcessor.java	19 Oct 2003 20:22:50 -0000	1.1.2.3
  @@ -217,15 +217,13 @@
           //initialize resources
           try {
               initializeResources();
  +            //init user repos
  +            initUsersRepository();
  +            //init regexp
  +            initRegExp();
           } catch (Exception e) {
               throw new MessagingException(e.getMessage(), e);
           }
  -
  -        //init user repos
  -        initUsersRepository();
  -
  -        //init regexp
  -        initRegExp();
       }
   
       /**
  @@ -450,22 +448,19 @@
       /**
        * Fetch the repository of users
        */
  -    protected void initUsersRepository() {
  +    protected void initUsersRepository() throws Exception {
           ComponentManager compMgr = (ComponentManager) getMailetContext().getAttribute(Constants.AVALON_COMPONENT_MANAGER);
  -        try {
  -            UsersStore usersStore = (UsersStore) compMgr.lookup("org.apache.james.services.UsersStore");
  -            String repName = getInitParameter("repositoryName");
  +        UsersStore usersStore = (UsersStore) compMgr.lookup("org.apache.james.services.UsersStore");
  +        String repName = getInitParameter("repositoryName");
   
  -            usersRepository = usersStore.getRepository(repName);
  -        } catch (Exception e) {
  -            log("Failed to retrieve Store component:" + e.getMessage());
  -        }
  +        usersRepository = usersStore.getRepository(repName);
  +        if (usersRepository == null) throw new Exception("Invalid user repository: " + repName);
       }
   
       /**
        * init the regexp
        */
  -    protected void initRegExp() {
  +    protected void initRegExp() throws Exception {
           StringBuffer regExp = new StringBuffer();
           if (autoBracket) {
               regExp.append("\\[");
  @@ -480,11 +475,8 @@
               regExp.append("|");
           }
           regExp.append("re:");
  -        try {
  -            pattern = new Perl5Compiler().compile(regExp.toString(), Perl5Compiler.CASE_INSENSITIVE_MASK);
  -        } catch (MalformedPatternException e) {
  -            throw new IllegalStateException("unable to parse regexp: " + e.getMessage());
  -        }
  +
  +        pattern = new Perl5Compiler().compile(regExp.toString(), Perl5Compiler.CASE_INSENSITIVE_MASK);
       }
   
       protected String normalizeSubject(String subject, String prefix) {
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org