From 177acedf3836e227daa22c5eae1d2022008ef611 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Sat, 22 Dec 2012 14:49:57 +0000 Subject: [PATCH] fix missing cache name in status page git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1425287 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/archiva/rest/services/AbstractRestService.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 064ae6262..b81d65c83 100644 --- 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 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; -- 2.39.5