MRM-1138 - Fix java.lang.NullPointerException: configuration can not be null on startup

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@753121 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 8 insertions, 3 deletions

diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
index af3180d13..cb00de9a8 100644
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
@@ -138,9 +138,14 @@ public class DefaultArchivaConfiguration
      */
     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 @@ public class DefaultArchivaConfiguration
             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 );
     }