fix missing cache name in status page

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

diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java
index 064ae62625d7324a8f7cfecd015685b0fa02eb91..b81d65c839e47f966039908e2c65a1430723f682 100644 (file)
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java
@@ -79,7 +79,7 @@ public abstract class AbstractRestService
 
 
     @Inject
-    @Named (value = "repositorySessionFactory")
+    @Named(value = "repositorySessionFactory")
     protected RepositorySessionFactory repositorySessionFactory;
 
     @Inject
@@ -92,7 +92,7 @@ public abstract class AbstractRestService
     protected RepositoryContentFactory repositoryContentFactory;
 
     @Inject
-    @Named ( value = "archivaTaskScheduler#repository" )
+    @Named(value = "archivaTaskScheduler#repository")
     protected DefaultRepositoryArchivaTaskScheduler repositoryTaskScheduler;
 
     @Context
@@ -173,7 +173,9 @@ public abstract class AbstractRestService
 
         for ( Map.Entry<String, T> entry : springBeans.entrySet() )
         {
-            String key = StringUtils.substringAfterLast( entry.getKey(), "#" );
+            String key = StringUtils.contains( entry.getKey(), '#' )
+                ? StringUtils.substringAfterLast( entry.getKey(), "#" )
+                : entry.getKey();
             beans.put( key, entry.getValue() );
         }
         return beans;