prevent NPE

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

diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
index dcd137b89ef1df431f280b9c1aa04b8a4a25467e..f8f83f3c4d206f2ed29abfb4ae16348dfbecc644 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
@@ -226,10 +226,19 @@ public class DefaultRedbackRuntimeConfigurationAdmin
             new BeanReplicator().replicateBean( archivaRuntimeConfiguration,
                                                 org.apache.archiva.configuration.RedbackRuntimeConfiguration.class );
 
+        if ( archivaRuntimeConfiguration.getLdapConfiguration() == null )
+        {
+            archivaRuntimeConfiguration.setLdapConfiguration( new LdapConfiguration() );
+        }
         redbackRuntimeConfiguration.setLdapConfiguration(
             new BeanReplicator().replicateBean( archivaRuntimeConfiguration.getLdapConfiguration(),
                                                 org.apache.archiva.configuration.LdapConfiguration.class ) );
 
+        if ( archivaRuntimeConfiguration.getUsersCacheConfiguration() == null )
+        {
+            archivaRuntimeConfiguration.setUsersCacheConfiguration( new CacheConfiguration() );
+        }
+
         redbackRuntimeConfiguration.setUsersCacheConfiguration(
             new BeanReplicator().replicateBean( archivaRuntimeConfiguration.getUsersCacheConfiguration(),
                                                 org.apache.archiva.configuration.CacheConfiguration.class ) );