svn commit: r398559 - /geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java

[gn...@apache.org]

Author: gnodet
Date: Mon May  1 02:29:01 2006
New Revision: 398559

URL: http://svn.apache.org/viewcvs?rev=398559&view=rev
Log:
Throw a meaningful NPE when the configurationManager is not set

Modified:
    geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java

Modified: geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java?rev=398559&r1=398558&r2=398559&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java (original)
+++ geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java Mon May  1 02:29:01 2006
@@ -83,10 +83,10 @@
     }
 
     public DeploymentContext(File baseDir, File inPlaceConfigurationDir, Environment environment, ConfigurationModuleType moduleType, Naming naming, ConfigurationManager configurationManager) throws DeploymentException {
-        this.configurationManager = configurationManager;
         if (baseDir == null) throw new NullPointerException("baseDir is null");
         if (environment == null) throw new NullPointerException("environment is null");
         if (moduleType == null) throw new NullPointerException("type is null");
+        if (configurationManager == null) throw new NullPointerException("configurationManager is null");
 
         if (!baseDir.exists()) {
             baseDir.mkdirs();
@@ -99,6 +99,8 @@
 
         this.configuration = createTempConfiguration(environment, moduleType, baseDir, inPlaceConfigurationDir, configurationManager, naming);
 
+        this.configurationManager = configurationManager;
+        
         if (null == inPlaceConfigurationDir) {
             resourceContext = new CopyResourceContext(configuration, baseDir);
         } else {