diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2024-12-05 23:33:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <support@gerrithub.io> | 2024-12-05 23:33:50 +0000 |
| commit | 46bc9c14d93c9609b277cf545eb2be21c6ed219e (patch) | |
| tree | 202048b705ed82f4ad6eb62eb4dc43b20d620a9b /org.eclipse.jgit/src/org/eclipse/jgit/attributes/Attribute.java | |
| parent | fb6adb0366bc3e15f30952fe49456b1f96bcf1af (diff) | |
| parent | 4156bdfe8ef8af2cc1d48a185e62fdf83e14c8ed (diff) | |
| download | jgit-46bc9c14d93c9609b277cf545eb2be21c6ed219e.tar.gz jgit-46bc9c14d93c9609b277cf545eb2be21c6ed219e.zip | |
Merge changes I172c43ff,I2a4c5743,Icc4b8d2f into stable-6.10
* changes:
Mark Attribute#getValue as @Nullable
Fix potential NPE in ResolveMerger#getAttributesContentMergeStrategy
Fix NPE in DiffFormatter#getDiffDriver
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/attributes/Attribute.java')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/attributes/Attribute.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/attributes/Attribute.java b/org.eclipse.jgit/src/org/eclipse/jgit/attributes/Attribute.java index fe3e22a21f..9c4d8700a2 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/attributes/Attribute.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/attributes/Attribute.java @@ -9,6 +9,8 @@ */ package org.eclipse.jgit.attributes; +import org.eclipse.jgit.annotations.Nullable; + /** * Represents an attribute. * <p> @@ -139,6 +141,7 @@ public final class Attribute { * * @return the attribute value (may be <code>null</code>) */ + @Nullable public String getValue() { return value; } |