Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-12 16:35:45 +01:00
Code Issues Packages Projects Releases Activity

fix potential bugs, detected by findbugs and pmd

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-12-24 15:45:03 +01:00
parent ef16a8bd9b
commit a1d031e587
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitUtil.java
View File

@@ -36,7 +36,6 @@ package sonia.scm.repository;
//~--- non-JDK imports -------------------------------------------------------- //~--- non-JDK imports --------------------------------------------------------
import org.eclipse.jgit.diff.DiffFormatter; import org.eclipse.jgit.diff.DiffFormatter;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.lib.RepositoryCache; import org.eclipse.jgit.lib.RepositoryCache;

12
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitReceiveHook.java
View File

@@ -275,11 +275,15 @@ public class GitReceiveHook implements PreReceiveHook, PostReceiveHook
scriptName = FILE_HOOK_PRE_RECEIVE; scriptName = FILE_HOOK_PRE_RECEIVE;
} }
File hookScript = getHookScript(directory, scriptName); if (scriptName != null)
if (hookScript != null)
{ {
executeFileHook(rpack, rc, hookScript, oldId, newId, rc.getRefName()); File hookScript = getHookScript(directory, scriptName);
if (hookScript != null)
{
executeFileHook(rpack, rc, hookScript, oldId, newId,
rc.getRefName());
}
} }
fireHookEvent(rpack, rc, directory, oldId, newId, type); fireHookEvent(rpack, rc, directory, oldId, newId, type);

1
scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnChangesetViewer.java
View File

@@ -49,7 +49,6 @@ import sonia.scm.util.Util;
//~--- JDK imports ------------------------------------------------------------ //~--- JDK imports ------------------------------------------------------------
import java.io.File; import java.io.File;
import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;

5
scm-webapp/src/main/java/sonia/scm/ScmLogFilePropertyDefiner.java
View File

@@ -62,9 +62,10 @@ public class ScmLogFilePropertyDefiner extends PropertyDefinerBase
File logDirectory = new File(SCMContext.getContext().getBaseDirectory(), File logDirectory = new File(SCMContext.getContext().getBaseDirectory(),
LOG_DIRECTORY); LOG_DIRECTORY);
if (!logDirectory.exists()) if (!logDirectory.exists() &&!logDirectory.mkdirs())
{ {
logDirectory.mkdirs(); throw new ConfigurationException(
"could not create log directory ".concat(logDirectory.getPath()));
} }
this.logDirectoryPath = logDirectory.getAbsolutePath(); this.logDirectoryPath = logDirectory.getAbsolutePath();