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

Fix off issue #22 <?m2e execute onConfiguration?> fails if pom is big… #23

Merged
merged 3 commits into from Apr 27, 2017
Merged

Fix off issue #22 <?m2e execute onConfiguration?> fails if pom is big… #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1bb3d93
Fix off issue #22 <?m2e execute onConfiguration?> fails if pom is big…
roka-actico Apr 2, 2017
86b68cd
Fix off issue #22
barclay-reg Apr 26, 2017
19d91ad
Fix off issue #22
barclay-reg Apr 27, 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
8 changes: 3 additions & 5 deletions src/main/java/org/codehaus/plexus/util/xml/pull/MXParser.java
View file
Open in desktop
Expand Up @@ -2469,7 +2469,7 @@ protected boolean parsePI()
if(tokenize) posStart = pos;
final int curLine = lineNumber;
final int curColumn = columnNumber;
int piTargetStart = pos + bufAbsoluteStart;
int piTargetStart = pos;
int piTargetEnd = -1;
final boolean normalizeIgnorableWS = tokenize == true && roundtripSupported == false;
boolean normalizedCR = false;
Expand All @@ -2495,7 +2495,7 @@ protected boolean parsePI()
seenQ = false;
} else {
if(piTargetEnd == -1 && isS(ch)) {
piTargetEnd = pos - 1 + bufAbsoluteStart;
piTargetEnd = pos - 1;

// [17] PITarget ::= Name - (('X' | 'x') ('M' | 'm') ('L' | 'l'))
if((piTargetEnd - piTargetStart) == 3) {
Expand All @@ -2520,7 +2520,7 @@ protected boolean parsePI()
}
parseXmlDecl(ch);
if(tokenize) posEnd = pos - 2;
final int off = piTargetStart - bufAbsoluteStart + 3;
final int off = piTargetStart + 3;
final int len = pos - 2 - off;
xmlDeclContent = newString(buf, off, len);
return false;
Expand Down Expand Up @@ -2575,8 +2575,6 @@ protected boolean parsePI()
//throw new XmlPullParserException(
// "processing instruction must have PITarget name", this, null);
}
piTargetStart -= bufAbsoluteStart;
piTargetEnd -= bufAbsoluteStart;
if(tokenize) {
posEnd = pos - 2;
if(normalizeIgnorableWS) {
Expand Down
66 changes: 66 additions & 0 deletions src/test/java/org/codehaus/plexus/util/xml/pull/MXParserTest.java
View file
Open in desktop
Expand Up @@ -162,4 +162,70 @@ public void testProcessingInstruction()
assertEquals( XmlPullParser.TEXT, parser.nextToken() );
assertEquals( XmlPullParser.END_TAG, parser.nextToken() );
}

public void testSubsequentProcessingInstructionShort()
throws Exception
{
StringBuffer sb = new StringBuffer();

sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
sb.append("<project>");
sb.append("<!-- comment -->");
sb.append("<?m2e ignore?>");
sb.append("</project>");


MXParser parser = new MXParser();
parser.setInput( new StringReader( sb.toString() ) );


assertEquals( XmlPullParser.PROCESSING_INSTRUCTION, parser.nextToken() );
assertEquals( XmlPullParser.START_TAG, parser.nextToken() );
assertEquals( XmlPullParser.COMMENT, parser.nextToken() );
assertEquals( XmlPullParser.PROCESSING_INSTRUCTION, parser.nextToken() );
assertEquals( XmlPullParser.END_TAG, parser.nextToken() );
}

public void testSubsequentProcessingInstructionMoreThan8k()
throws Exception
{
StringBuffer sb = new StringBuffer();

sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
sb.append("<project>");


// add ten times 1000 chars as comment
for (int j = 0; j < 10; j++) {

sb.append("<!-- ");
for (int i = 0; i < 2000; i++) {
sb.append("ten bytes ");
}
sb.append(" -->");
}

sb.append("<?m2e ignore?>");
sb.append("</project>");


MXParser parser = new MXParser();
parser.setInput( new StringReader( sb.toString() ) );


assertEquals( XmlPullParser.PROCESSING_INSTRUCTION, parser.nextToken() );
assertEquals( XmlPullParser.START_TAG, parser.nextToken() );
assertEquals( XmlPullParser.COMMENT, parser.nextToken() );
assertEquals( XmlPullParser.COMMENT, parser.nextToken() );
assertEquals( XmlPullParser.COMMENT, parser.nextToken() );
assertEquals( XmlPullParser.COMMENT, parser.nextToken() );
assertEquals( XmlPullParser.COMMENT, parser.nextToken() );
assertEquals( XmlPullParser.COMMENT, parser.nextToken() );
assertEquals( XmlPullParser.COMMENT, parser.nextToken() );
assertEquals( XmlPullParser.COMMENT, parser.nextToken() );
assertEquals( XmlPullParser.COMMENT, parser.nextToken() );
assertEquals( XmlPullParser.COMMENT, parser.nextToken() );
assertEquals( XmlPullParser.PROCESSING_INSTRUCTION, parser.nextToken() );
assertEquals( XmlPullParser.END_TAG, parser.nextToken() );
}
}