summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2016-09-21 18:08:00 +0200
committerMatthias Sohn <matthias.sohn@sap.com>2016-09-21 18:08:00 +0200
commit1b11f4fddaf5f781663fd13ea5621189b82db5be (patch)
tree0194725a2bcecd333dd55166a314cdbe174073bf
parent6cd6ccb65a9952e8f6c802fa8b93026645df01dd (diff)
parentc10a7e7931473f197ae30669840942413db6b6cd (diff)
downloadjgit-1b11f4fddaf5f781663fd13ea5621189b82db5be.tar.gz
jgit-1b11f4fddaf5f781663fd13ea5621189b82db5be.zip
Merge branch 'stable-4.5'
* stable-4.5: Turn off doclint also during Maven site generation Prepare 4.5.1-SNAPSHOT builds JGit v4.5.0.201609210915-r Unconditionally close repository in unregisterAndCloseRepository Change-Id: Ibfd11669cd74d2e62b014c18fd39b646b200c8c5 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryCache.java8
-rw-r--r--pom.xml11
2 files changed, 14 insertions, 5 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryCache.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryCache.java
index 29ef084830..2e0ed16a55 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryCache.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryCache.java
@@ -305,11 +305,9 @@ public class RepositoryCache {
private void unregisterAndCloseRepository(final Key location,
Repository db) {
synchronized (lockFor(location)) {
- if (isExpired(db)) {
- Repository oldDb = unregisterRepository(location);
- if (oldDb != null) {
- oldDb.close();
- }
+ Repository oldDb = unregisterRepository(location);
+ if (oldDb != null) {
+ oldDb.doClose();
}
}
}
diff --git a/pom.xml b/pom.xml
index 56164fc772..c4e908e91d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -683,6 +683,17 @@
</plugin>
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <additionalparam>-Xdoclint:-missing</additionalparam>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
</profile>
<profile>
<id>static-checks</id>