svn commit: r1425375 - /archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java

[olamy]

Author: olamy
Date: Sat Dec 22 23:44:40 2012
New Revision: 1425375

URL: http://svn.apache.org/viewvc?rev=1425375&view=rev
Log:
prevent NPE

Modified:
    
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java

Modified: 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java?rev=1425375&r1=1425374&r2=1425375&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
 Sat Dec 22 23:44:40 2012
@@ -226,10 +226,19 @@ public class DefaultRedbackRuntimeConfig
             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 ) );