diff options
| author | Edwin Kempin <edwin.kempin@sap.com> | 2013-10-05 11:33:55 +0200 |
|---|---|---|
| committer | Edwin Kempin <edwin.kempin@sap.com> | 2013-10-05 11:35:09 +0200 |
| commit | 43aadc2520378cfdb7e48a3772db38c35afedd2c (patch) | |
| tree | 02ff4ba6cf3cf5aae72d1d2248ce5622f6215241 | |
| parent | d292e7b5562ffb84a4e6e03c9bb2d9e48cc2a576 (diff) | |
| parent | ef48818083df6659aad02a0898826f3c404ee189 (diff) | |
Merge branch 'stable-2.6' into 'stable-2.7'
* stable-2.6:
Skip non-commits when verifying access for 'add branch' operation
Fix gerrit-extension-api-X.Y-all-sources.jar
Change-Id: I937e595e6fef942763dd5dd4e1436212d8b6ae3b
| -rw-r--r-- | gerrit-extension-api/pom.xml | 13 | ||||
| -rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectControl.java | 8 |
2 files changed, 20 insertions, 1 deletions
diff --git a/gerrit-extension-api/pom.xml b/gerrit-extension-api/pom.xml index bcdbfab239..4ccd59361c 100644 --- a/gerrit-extension-api/pom.xml +++ b/gerrit-extension-api/pom.xml @@ -53,6 +53,19 @@ limitations under the License. <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>bundle-sources</id> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> <configuration> <createSourcesJar>true</createSourcesJar> diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectControl.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectControl.java index 937f84362c..a50d33dbd5 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectControl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectControl.java @@ -40,6 +40,7 @@ import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.assistedinject.Assisted; +import org.eclipse.jgit.errors.IncorrectObjectTypeException; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevCommit; @@ -468,7 +469,12 @@ public class ProjectControl { Repository repo = repoManager.openRepository(projName); try { for (Entry<String, Ref> entry : repo.getAllRefs().entrySet()) { - RevCommit tip = rw.parseCommit(entry.getValue().getObjectId()); + RevCommit tip; + try { + tip = rw.parseCommit(entry.getValue().getObjectId()); + } catch (IncorrectObjectTypeException e) { + continue; + } if (rw.isMergedInto(commit, tip) && controlForRef(entry.getKey()).canPerform(Permission.READ)) { return true; |