Browse Source

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>
stable-4.6
Matthias Sohn 8 years ago
parent
commit
1b11f4fdda
  1. 4
      org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryCache.java
  2. 11
      pom.xml

4
org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryCache.java

@ -305,11 +305,9 @@ public class RepositoryCache {
private void unregisterAndCloseRepository(final Key location, private void unregisterAndCloseRepository(final Key location,
Repository db) { Repository db) {
synchronized (lockFor(location)) { synchronized (lockFor(location)) {
if (isExpired(db)) {
Repository oldDb = unregisterRepository(location); Repository oldDb = unregisterRepository(location);
if (oldDb != null) { if (oldDb != null) {
oldDb.close(); oldDb.doClose();
}
} }
} }
} }

11
pom.xml

@ -683,6 +683,17 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </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>
<profile> <profile>
<id>static-checks</id> <id>static-checks</id>

Loading…
Cancel
Save