Fix compilation error caused by JGit update

This commit is contained in:
Naoki Takezoe
2016-01-01 17:49:15 +09:00
parent abd729e45f
commit be3aa21651
6 changed files with 6 additions and 14 deletions

View File

@@ -683,7 +683,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
headName, loginAccount.fullName, loginAccount.mailAddress, message) headName, loginAccount.fullName, loginAccount.mailAddress, message)
inserter.flush() inserter.flush()
inserter.release() inserter.close()
// update refs // update refs
val refUpdate = git.getRepository.updateRef(headName) val refUpdate = git.getRepository.updateRef(headName)

View File

@@ -169,7 +169,7 @@ object PluginRegistry {
)) ))
} catch { } catch {
case e: Exception => { case e: Throwable => {
logger.error(s"Error during plugin initialization", e) logger.error(s"Error during plugin initialization", e)
} }
} }

View File

@@ -164,7 +164,7 @@ object MergeService{
val inserter = repository.newObjectInserter val inserter = repository.newObjectInserter
val mergeCommitId = inserter.insert(mergeCommit) val mergeCommitId = inserter.insert(mergeCommit)
inserter.flush() inserter.flush()
inserter.release() inserter.close()
mergeCommitId mergeCommitId
} }
private def parseCommit(id:ObjectId) = using(new RevWalk( repository ))(_.parseCommit(id)) private def parseCommit(id:ObjectId) = using(new RevWalk( repository ))(_.parseCommit(id))

View File

@@ -79,8 +79,8 @@ trait RepositorySearchService { self: IssuesService =>
} }
} }
} }
treeWalk.release treeWalk.close()
revWalk.release revWalk.close()
list.toList list.toList
} }

View File

@@ -1,8 +1,6 @@
package gitbucket.core.util package gitbucket.core.util
import org.eclipse.jgit.api.Git import org.eclipse.jgit.api.Git
import org.eclipse.jgit.revwalk.RevWalk
import org.eclipse.jgit.treewalk.TreeWalk
import scala.util.control.Exception._ import scala.util.control.Exception._
import scala.language.reflectiveCalls import scala.language.reflectiveCalls
@@ -31,12 +29,6 @@ object ControlUtil {
git2.getRepository.close() git2.getRepository.close()
} }
def using[T](revWalk: RevWalk)(f: RevWalk => T): T =
try f(revWalk) finally revWalk.release()
def using[T](treeWalk: TreeWalk)(f: TreeWalk => T): T =
try f(treeWalk) finally treeWalk.release()
def ignore[T](f: => Unit): Unit = try { def ignore[T](f: => Unit): Unit = try {
f f
} catch { } catch {

View File

@@ -688,7 +688,7 @@ object JGitUtil {
val newHeadId = inserter.insert(newCommit) val newHeadId = inserter.insert(newCommit)
inserter.flush() inserter.flush()
inserter.release() inserter.close()
val refUpdate = git.getRepository.updateRef(ref) val refUpdate = git.getRepository.updateRef(ref)
refUpdate.setNewObjectId(newHeadId) refUpdate.setNewObjectId(newHeadId)