summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Milanesio <luca.milanesio@gmail.com>2024-05-06 08:50:34 +0100
committerLuca Milanesio <luca.milanesio@gmail.com>2024-05-06 12:12:45 +0100
commit91746d58a44f41c91169da0f0b8f2f795f7bd36d (patch)
treef4823823dc1f012913f782fe837cdb3f2be75e8a
parent76245a64626c922dcee74577a5894d75a7749cbc (diff)
Fix NPE upon Git clone
The Change.getServerid() is flagged as @Nullable and therefore could lead to a NPE when performing a permission check upon Gerrit clone. Bug: Issue 338826950 Release-Notes: Fix NPE during git clone Change-Id: I7d9978ceb8397c9dde5a41fa92af93bce54bf1d9
-rw-r--r--java/com/google/gerrit/server/git/ChangesByProjectCacheImpl.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/com/google/gerrit/server/git/ChangesByProjectCacheImpl.java b/java/com/google/gerrit/server/git/ChangesByProjectCacheImpl.java
index b5a53b2125..66c63c6b08 100644
--- a/java/com/google/gerrit/server/git/ChangesByProjectCacheImpl.java
+++ b/java/com/google/gerrit/server/git/ChangesByProjectCacheImpl.java
@@ -286,7 +286,7 @@ public class ChangesByProjectCacheImpl implements ChangesByProjectCache {
int size = 0;
size += JavaWeights.OBJECT; // change
size += JavaWeights.REFERENCE + GerritWeights.KEY_INT; // changeId
- size += JavaWeights.REFERENCE + c.getServerId().length();
+ size += JavaWeights.REFERENCE + (c.getServerId() == null ? 0 : c.getServerId().length());
size += JavaWeights.REFERENCE + JavaWeights.OBJECT + 40; // changeKey;
size += JavaWeights.REFERENCE + GerritWeights.TIMESTAMP; // createdOn;
size += JavaWeights.REFERENCE + GerritWeights.TIMESTAMP; // lastUpdatedOn;