svn commit: r744783 - /archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-web/archiva-repository-servlet/src/main/java/org/apache/archiva/web/servlet/RepositoryServlet.java

[jdumay]

Author: jdumay
Date: Mon Feb 16 00:00:04 2009
New Revision: 744783

URL: http://svn.apache.org/viewvc?rev=744783&view=rev
Log:
Missing bean params should throw servlet exceptions

Modified:
    
archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-web/archiva-repository-servlet/src/main/java/org/apache/archiva/web/servlet/RepositoryServlet.java

Modified: 
archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-web/archiva-repository-servlet/src/main/java/org/apache/archiva/web/servlet/RepositoryServlet.java
URL: 
http://svn.apache.org/viewvc/archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-web/archiva-repository-servlet/src/main/java/org/apache/archiva/web/servlet/RepositoryServlet.java?rev=744783&r1=744782&r2=744783&view=diff
==============================================================================
--- 
archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-web/archiva-repository-servlet/src/main/java/org/apache/archiva/web/servlet/RepositoryServlet.java
 (original)
+++ 
archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-web/archiva-repository-servlet/src/main/java/org/apache/archiva/web/servlet/RepositoryServlet.java
 Mon Feb 16 00:00:04 2009
@@ -64,11 +64,29 @@
     @Override
     public void init(ServletConfig config) throws ServletException
     {
+        final String repositoryManagerFactoryName = 
config.getInitParameter(REPOSITORY_MANAGER_FACTORY);
+        if (repositoryManagerFactoryName == null)
+        {
+            throw new ServletException(REPOSITORY_MANAGER_FACTORY + " cannot 
be null");
+        }
+
+        final String preRepositoryInterceptorFactoryName = 
config.getInitParameter(PREREPOSITORY_INTERCEPTOR_FACTORY);
+        if (preRepositoryInterceptorFactoryName == null)
+        {
+            throw new ServletException(PREREPOSITORY_INTERCEPTOR_FACTORY + " 
cannot be null");
+        }
+
+        final String postRepositoryInterceptorFactoryName = 
config.getInitParameter(POSTREPOSITORY_INTERCEPTOR_FACTORY);
+        if (postRepositoryInterceptorFactoryName == null)
+        {
+            throw new ServletException(POSTREPOSITORY_INTERCEPTOR_FACTORY + " 
cannot be null");
+        }
+
         super.init(config);
         final ApplicationContext applicationContext = 
WebApplicationContextUtils.getRequiredWebApplicationContext(config.getServletContext());
-        repositoryManagerFactory = 
(RepositoryManagerFactory)applicationContext.getBean(config.getInitParameter(REPOSITORY_MANAGER_FACTORY));
-        preRepositoryInterceptorFactory = 
(RepositoryInterceptorFactory<PreRepositoryInterceptor>)applicationContext.getBean(config.getInitParameter(PREREPOSITORY_INTERCEPTOR_FACTORY));
-        postRepositoryInterceptorFactory = 
(RepositoryInterceptorFactory<PostRepositoryInterceptor>)applicationContext.getBean(config.getInitParameter(POSTREPOSITORY_INTERCEPTOR_FACTORY));
+        repositoryManagerFactory = 
(RepositoryManagerFactory)applicationContext.getBean(repositoryManagerFactoryName);
+        preRepositoryInterceptorFactory = 
(RepositoryInterceptorFactory<PreRepositoryInterceptor>)applicationContext.getBean(preRepositoryInterceptorFactoryName);
+        postRepositoryInterceptorFactory = 
(RepositoryInterceptorFactory<PostRepositoryInterceptor>)applicationContext.getBean(postRepositoryInterceptorFactoryName);
     }
 
     @Override