svn commit: r753121 - /archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java

[jdumay]

Author: jdumay
Date: Fri Mar 13 05:22:58 2009
New Revision: 753121

URL: http://svn.apache.org/viewvc?rev=753121&view=rev
Log:
MRM-1138 - Fix java.lang.NullPointerException: configuration can not be null on 
startup

Modified:
    
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java

Modified: 
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java?rev=753121&r1=753120&r2=753121&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
 Fri Mar 13 05:22:58 2009
@@ -138,9 +138,14 @@
      */
     private boolean isConfigurationDefaulted = false;
 
-    private static final String KEY = "org.apache.maven.archiva";   
+    private static final String KEY = "org.apache.maven.archiva";
 
-    public synchronized Configuration getConfiguration()
+    public Configuration getConfiguration()
+    {
+        return loadConfiguration();
+    }
+
+    private synchronized Configuration loadConfiguration()
     {
         if ( configuration == null )
         {
@@ -642,13 +647,13 @@
             expressionEvaluator.addExpressionSource( new 
SystemPropertyExpressionSource() );
             userConfigFilename = expressionEvaluator.expand( 
userConfigFilename );
             altConfigFilename = expressionEvaluator.expand( altConfigFilename 
);
+            loadConfiguration();
         }
         catch ( EvaluatorException e )
         {
             throw new InitializationException( "Unable to evaluate expressions 
found in "
                 + "userConfigFilename or altConfigFilename." );
         }
-
         registry.addChangeListener( this );
     }