svn commit: r1425287 - /archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java

[olamy]

Author: olamy
Date: Sat Dec 22 14:49:57 2012
New Revision: 1425287

URL: http://svn.apache.org/viewvc?rev=1425287&view=rev
Log:
fix missing cache name in status page

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java?rev=1425287&r1=1425286&r2=1425287&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java
 Sat Dec 22 14:49:57 2012
@@ -79,7 +79,7 @@ public abstract class AbstractRestServic
 
 
     @Inject
-    @Named (value = "repositorySessionFactory")
+    @Named(value = "repositorySessionFactory")
     protected RepositorySessionFactory repositorySessionFactory;
 
     @Inject
@@ -92,7 +92,7 @@ public abstract class AbstractRestServic
     protected RepositoryContentFactory repositoryContentFactory;
 
     @Inject
-    @Named ( value = "archivaTaskScheduler#repository" )
+    @Named(value = "archivaTaskScheduler#repository")
     protected DefaultRepositoryArchivaTaskScheduler repositoryTaskScheduler;
 
     @Context
@@ -173,7 +173,9 @@ public abstract class AbstractRestServic
 
         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;