MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

avoid volatile double-read

Browse Source
This commit is contained in:
Alexey Kudravtsev
2017-11-16 16:25:31 +03:00
parent b768ada659
commit b04e444f09
1 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlTagValueImpl.java
+22 -17
View File
@@ -56,23 +56,27 @@ public class XmlTagValueImpl implements XmlTagValue{
@NotNull
public XmlText[] getTextElements() {
XmlText[] textElements = myTextElements;
if(textElements != null) return textElements;
textElements = Arrays.stream(myElements)
.filter(element -> element instanceof XmlText)
.map(element -> (XmlText)element).toArray(XmlText[]::new);
return myTextElements = textElements.length == 0 ? XmlText.EMPTY_ARRAY : textElements;
if (textElements == null) {
textElements = Arrays.stream(myElements)
.filter(element -> element instanceof XmlText)
.map(element -> (XmlText)element).toArray(XmlText[]::new);
myTextElements = textElements = textElements.length == 0 ? XmlText.EMPTY_ARRAY : textElements;
}
return textElements;
}
@Override
@NotNull
public String getText() {
String text = myText;
if(text != null) return text;
final StringBuilder consolidatedText = new StringBuilder();
for (final XmlTagChild element : myElements) {
consolidatedText.append(element.getText());
if (text == null) {
final StringBuilder consolidatedText = new StringBuilder();
for (final XmlTagChild element : myElements) {
consolidatedText.append(element.getText());
}
myText = text = consolidatedText.toString();
}
return myText = consolidatedText.toString();
return text;
}
@Override
@@ -91,14 +95,15 @@ public class XmlTagValueImpl implements XmlTagValue{
@NotNull
public String getTrimmedText() {
String trimmedText = myTrimmedText;
if(trimmedText != null) return trimmedText;
final StringBuilder consolidatedText = new StringBuilder();
final XmlText[] textElements = getTextElements();
for (final XmlText textElement : textElements) {
consolidatedText.append(textElement.getValue());
if (trimmedText == null) {
final StringBuilder consolidatedText = new StringBuilder();
final XmlText[] textElements = getTextElements();
for (final XmlText textElement : textElements) {
consolidatedText.append(textElement.getValue());
}
myTrimmedText = trimmedText = consolidatedText.toString().trim();
}
return myTrimmedText = consolidatedText.toString().trim();
return trimmedText;
}
@Override