Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GEODE-3306: Remove whitespace StringBuffers/nodes created by Apache X… #668

Closed
wants to merge 8 commits into from
Closed

GEODE-3306: Remove whitespace StringBuffers/nodes created by Apache X… #668

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6849c21
GEODE-3306: Remove whitespace StringBuffers/nodes created by Apache X…
darrenfoong Jul 29, 2017
6dd702c
GEODE-3306: Add unit tests
darrenfoong Aug 3, 2017
0a9c318
GEODE-3306: Remove duplicate call to connect()
darrenfoong Aug 3, 2017
64d46b0
GEODE 3306: Unset system properties after parsing
darrenfoong Aug 3, 2017
8d924ba
GEODE-3306: Use StringUtils.isBlank()
darrenfoong Aug 17, 2017
0fb6ea2
GEODE-3306: Use RestoreSystemProperties() in unit tests
darrenfoong Aug 17, 2017
0c2a5b8
GEODE-3306: Remove unnecessary variable assignment
darrenfoong Aug 17, 2017
102c89f
GEODE-3306: Fix unit test
darrenfoong Aug 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 24 additions & 0 deletions geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2596,6 +2596,18 @@ private void endDeclarable() {

public void startElement(String namespaceURI, String localName, String qName, Attributes atts)
throws SAXException {
// This while loop pops all StringBuffers at the top of the stack
// that contain only whitespace; see GEODE-3306
while (!stack.empty()) {
Object o = stack.peek();
if (o instanceof StringBuffer
&& ((StringBuffer) o).toString().replaceAll("\\s", "").equals("")) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think StringUtils.isBlank( (StringBuffer o).toString()) might be simpler here as well as in endElement.

stack.pop();
} else {
break;
}
}

if (qName.equals(CACHE)) {
startCache(atts);
} else if (qName.equals(CLIENT_CACHE)) {
Expand Down Expand Up @@ -2872,6 +2884,18 @@ private void startDiskWriteAttributes(Attributes atts) {
}

public void endElement(String namespaceURI, String localName, String qName) throws SAXException {
// This while loop pops all StringBuffers at the top of the stack
// that contain only whitespace; see GEODE-3306
while (!stack.empty()) {
Object o = stack.peek();
if (o instanceof StringBuffer
&& ((StringBuffer) o).toString().replaceAll("\\s", "").equals("")) {
stack.pop();
} else {
break;
}
}

try {
// logger.debug("endElement namespaceURI=" + namespaceURI
// + "; localName = " + localName + "; qName = " + qName);
Expand Down