From ac4d4bb080af542f3da4bc2afb6ed5f2d3e064e6 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Sat, 22 Dec 2012 23:44:40 +0000 Subject: [PATCH] prevent NPE git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1425375 13f79535-47bb-0310-9956-ffa450edef68 --- .../runtime/DefaultRedbackRuntimeConfigurationAdmin.java | 9 +++++++++ 1 file changed, 9 insertions(+) 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 dcd137b89..f8f83f3c4 100644 --- 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 ) ); -- 2.39.5