Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-03 20:15:52 +01:00
Code Issues Packages Projects Releases Activity

fix some warning and removed some unused imports

Browse Source
This commit is contained in:
Sebastian Sdorra
2017-01-14 12:05:53 +01:00
parent c149b180a1
commit 7e6f4e1a7f
5 changed files with 26 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryHandler.java
View File

@@ -52,12 +52,10 @@ import sonia.scm.util.AssertUtil;
import java.io.File;
import java.io.IOException;
import java.util.Timer;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.SCMContextProvider;
import sonia.scm.schedule.Scheduler;
import sonia.scm.schedule.Task;
@@ -307,21 +305,17 @@ public class GitRepositoryHandler
protected void create(Repository repository, File directory)
throws RepositoryException, IOException
{
org.eclipse.jgit.lib.Repository gitRepository = null;
try
{
gitRepository = new FileRepositoryBuilder().setGitDir(
directory).readEnvironment().findGitDir().build();
try (org.eclipse.jgit.lib.Repository gitRepository = build(directory)) {
gitRepository.create(true);
}
finally
{
if (gitRepository != null)
{
gitRepository.close();
}
}
}
private org.eclipse.jgit.lib.Repository build(File directory) throws IOException {
return new FileRepositoryBuilder()
.setGitDir(directory)
.readEnvironment()
.findGitDir()
.build();
}
/**

9
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBrowseCommand.java
View File

@@ -269,7 +269,7 @@ public class GitBrowseCommand extends AbstractGitCommand
walk.markStart(commit);
result = Util.getFirst(walk);
}
catch (Exception ex)
catch (IOException ex)
{
logger.error("could not parse commit for file", ex);
}
@@ -414,7 +414,7 @@ public class GitBrowseCommand extends AbstractGitCommand
revision);
}
Map<String, SubRepository> subRepositories = null;
Map<String, SubRepository> subRepositories;
ByteArrayOutputStream baos = new ByteArrayOutputStream();
try
@@ -456,7 +456,6 @@ public class GitBrowseCommand extends AbstractGitCommand
//~--- fields ---------------------------------------------------------------
/** Field description */
private Map<ObjectId, Map<String, SubRepository>> subrepositoryCache =
Maps.newHashMap();
/** sub repository cache */
private final Map<ObjectId, Map<String, SubRepository>> subrepositoryCache = Maps.newHashMap();
}