diff options
| author | Jacek Centkowski <geminica.programs@gmail.com> | 2024-05-06 13:26:52 +0200 |
|---|---|---|
| committer | Jacek Centkowski <geminica.programs@gmail.com> | 2024-05-06 13:42:52 +0200 |
| commit | b4f477869e6406ec63897e32d1d22ac5e8e754e6 (patch) | |
| tree | f4801349340b80dafac4ff236e9aae293a824897 | |
| parent | 79a4366f4bf68ba19877c6b2cb612a5b49892501 (diff) | |
| parent | 91746d58a44f41c91169da0f0b8f2f795f7bd36d (diff) | |
Merge branch 'stable-3.8' into stable-3.9
* stable-3.8:
Fix NPE upon Git clone
Release-Notes: skip
Change-Id: Ifb06b484473eee96003db850f981a83348d1a85b
| -rw-r--r-- | java/com/google/gerrit/server/git/ChangesByProjectCacheImpl.java | 2 |
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; |