non necessary local variable

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

diff --git a/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/XMLReader.java b/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/XMLReader.java
index 3e5269bf96ddb44bb88de3bfbd1674131a6da0ae..d87c176f719d6a2f7c2b7c4777e6053f298a13d9 100644 (file)
--- a/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/XMLReader.java
+++ b/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/XMLReader.java
@@ -158,8 +158,7 @@ public class XMLReader
 
         if ( evaluated instanceof Element )
         {
-            Element evalElem = (Element) evaluated;
-            return evalElem;
+            return (Element) evaluated;
         }
         else
         {

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 012b32c2a689c2987f49b26d6ee26fd3b2c3df22..c8b6423ae78620b0501a323a38fd878086e0ddfa 100644 (file)
--- 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
@@ -1063,8 +1063,7 @@ public class DefaultRepositoriesService
 
         try
         {
-            boolean res = userRepositories.isAuthorizedToDeleteArtifacts( userName, repoId );
-            return res;
+            return userRepositories.isAuthorizedToDeleteArtifacts( userName, repoId );
         }
         catch ( ArchivaSecurityException e )
         {

diff --git a/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java b/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
index 0e62fe37598fc96f0dcbfd7fc92ed1db44dba513..f0a3abc335a7b2bc06096a9205c5929a0a0b8d18 100644 (file)
--- a/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
+++ b/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
@@ -89,8 +89,7 @@ public class FileMetadataRepository
     {
         // TODO: should be configurable, like the index
         String basedir = configuration.getConfiguration().getManagedRepositoriesAsMap().get( repoId ).getLocation();
-        File dir = new File( basedir, ".archiva" );
-        return dir;
+        return new File( basedir, ".archiva" );
     }
 
     private File getDirectory( String repoId )