You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2016/05/20 19:32:40 UTC
groovy git commit: GROOVY-7832: NullPointerException in GroovyConsole
with an input method (closes #326)
Repository: groovy
Updated Branches:
refs/heads/master 7da8b58ca -> 237d16ee3
GROOVY-7832: NullPointerException in GroovyConsole with an input method (closes #326)
add null guard
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/237d16ee
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/237d16ee
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/237d16ee
Branch: refs/heads/master
Commit: 237d16ee361d03ea4741c8925418c34e0764a287
Parents: 7da8b58
Author: Jochen Theodorou <bl...@gmx.org>
Authored: Tue May 3 07:36:11 2016 +0200
Committer: pascalschumacher <pa...@gmx.net>
Committed: Fri May 20 21:31:23 2016 +0200
----------------------------------------------------------------------
.../groovy/groovy/ui/text/StructuredSyntaxDocumentFilter.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/237d16ee/subprojects/groovy-console/src/main/groovy/groovy/ui/text/StructuredSyntaxDocumentFilter.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-console/src/main/groovy/groovy/ui/text/StructuredSyntaxDocumentFilter.java b/subprojects/groovy-console/src/main/groovy/groovy/ui/text/StructuredSyntaxDocumentFilter.java
index e54961e..3945c2f 100644
--- a/subprojects/groovy-console/src/main/groovy/groovy/ui/text/StructuredSyntaxDocumentFilter.java
+++ b/subprojects/groovy-console/src/main/groovy/groovy/ui/text/StructuredSyntaxDocumentFilter.java
@@ -269,7 +269,11 @@ public class StructuredSyntaxDocumentFilter extends DocumentFilter {
*/
public void replace(DocumentFilter.FilterBypass fb, int offset,
int length, String text, AttributeSet attrs)
- throws BadLocationException {
+ throws BadLocationException
+ {
+ // text might be null and indicates no replacement text
+ if (text == null) text = "";
+
// remove problem meta characters returns
text = replaceMetaCharacters(text);