diff options
| author | Matthias Sohn | 2016-02-15 22:27:28 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2016-02-15 22:28:18 +0000 |
| commit | 514b11ddccc93cf21475cd3e61dde5d2ba8171f2 (patch) | |
| tree | d8cf6e4de084facf58d667653003f10a798a5d60 /org.eclipse.jgit.junit.http | |
| parent | 621b0740b3acabe9cf25a054cc753f911cfba68a (diff) | |
| parent | e9ce3a992ca5627cfa55aa0c5af7c42387c24709 (diff) | |
| download | jgit-514b11ddccc93cf21475cd3e61dde5d2ba8171f2.tar.gz jgit-514b11ddccc93cf21475cd3e61dde5d2ba8171f2.tar.xz jgit-514b11ddccc93cf21475cd3e61dde5d2ba8171f2.zip | |
Merge branch 'stable-4.2'
* stable-4.2:
Don't use deprecated LockFile constructor
Fix warnings about unchecked conversion of MergeResult
MockServletConfig: Fix warning about unchecked conversion of Enumeration
HugeFileTest: Make Git a class member and open in try-with-resource
Suppress "unchecked cast" warnings related to UploadPackFactory.DISABLED
DiffAlgorithms: Fix warnings about variable hiding
DirCacheBasicTest: Open ObjectInserter.Formatter in try-with-resource
DirCacheBuilderIteratorTest: Open TreeWalk in try-with-resource
DirCacheCGitCompatabilityTest: Open TreeWalk in try-with-resource
DirCacheCheckoutMaliciousPathTest: Open Git and RevWalk in t-w-r
DirCacheIteratorTest: Open TreeWalk instances in try-with-resource
ForPathTest: Open TreeWalk in try-with-resource
GitConstructionTest: Open Git instance in try-with-resource
IndexDiffTest: Open Git instances in try-with-resources
ManifestParserTest: Don't use deprecated StringBufferInputStream
InMemoryRepository: Remove unused RevWalk from batch method signature
IndexModificationTimesTest: Open Git instances in try-with-resource
InterIndexDiffFilterTest: Open TreeWalk in try-with-resource
LockFileTest: Open Git instance in try-with-resource
JGit v4.1.2.201602141800-r
MergeCommandTest: Use JUnit's assume to check preconditions
MergeCommandTest: Open Git instances in try-with-resource
Change-Id: Ie5dba6b9132a29e86958a04fa2b76465bcd2c6b5
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.junit.http')
| -rw-r--r-- | org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/MockServletConfig.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/MockServletConfig.java b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/MockServletConfig.java index 0b4530ded2..59765890bd 100644 --- a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/MockServletConfig.java +++ b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/MockServletConfig.java @@ -62,7 +62,7 @@ public class MockServletConfig implements ServletConfig { return parameters.get(name); } - public Enumeration getInitParameterNames() { + public Enumeration<String> getInitParameterNames() { final Iterator<String> i = parameters.keySet().iterator(); return new Enumeration<String>() { public boolean hasMoreElements() { |