You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/09/17 15:00:55 UTC
[isis] branch master updated: ISIS-2871: fixes markup semantics
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 9685ebc ISIS-2871: fixes markup semantics
9685ebc is described below
commit 9685ebc638d8a9ac4ad35443f8fbd02438309e45
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Sep 17 16:58:28 2021 +0200
ISIS-2871: fixes markup semantics
---
.../core/metamodel/facets/value/markup/MarkupValueSemantics.java | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/markup/MarkupValueSemantics.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/markup/MarkupValueSemantics.java
index 7439df8..0e873ea 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/markup/MarkupValueSemantics.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/markup/MarkupValueSemantics.java
@@ -39,11 +39,17 @@ implements
@Override
public String toEncodedString(final Markup markup) {
+ if(markup==null) {
+ return null;
+ }
return markup.asHtml();
}
@Override
public Markup fromEncodedString(final String html) {
+ if(html==null) {
+ return null;
+ }
return new Markup(html);
}