aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2012-12-22 14:49:57 +0000
committerOlivier Lamy <olamy@apache.org>2012-12-22 14:49:57 +0000
commit177acedf3836e227daa22c5eae1d2022008ef611 (patch)
treeb62ec646f9d61ad514f2f74e9898cad8e5127a55
parent0a6164227182d1d2e8394a68e7767277e82ac6f2 (diff)
downloadarchiva-177acedf3836e227daa22c5eae1d2022008ef611.tar.gz
archiva-177acedf3836e227daa22c5eae1d2022008ef611.zip
fix missing cache name in status page
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1425287 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java8
1 files 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<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;