From: Brett Porter <brett@apache.org>
Date: Wed, 30 Jul 2014 08:06:15 +0000 (+1000)
Subject: more autowiring
X-Git-Tag: archiva-2.1.1~21
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=be20d16cfdc0525e9b5cc58a5953b78c57fc17e1;p=archiva.git

more autowiring
---

diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
index 0aa6660c0..462af2127 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
@@ -82,6 +82,7 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.maven.index.context.IndexingContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.inject.Inject;
@@ -144,6 +145,7 @@ public class DefaultRepositoriesService
     protected RepositorySessionFactory repositorySessionFactory;
 
     @Inject
+    @Autowired(required = false)
     protected List<RepositoryListener> listeners = new ArrayList<RepositoryListener>();
 
     @Inject
diff --git a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
index 559798a62..9570d7dbd 100644
--- a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
+++ b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
@@ -80,7 +80,7 @@ public class DefaultMetadataResolver
 
     @Inject
     @Autowired(required = false)
-    private List<RepositoryListener> listeners;
+    private List<RepositoryListener> listeners = new ArrayList<>();
 
     /**
      * Cache used for namespaces