Bug 505668 - NullPointerException in AbstractJSONSourceFormatter.getLineDelimiter As IStructuredModel.getStructuredDocument() can return null, the according null-check is added Signed-off-by: Victor Rubezhny <vrubezhny@redhat.com>
diff --git a/bundles/org.eclipse.wst.json.core/src/org/eclipse/wst/json/core/internal/format/AbstractJSONSourceFormatter.java b/bundles/org.eclipse.wst.json.core/src/org/eclipse/wst/json/core/internal/format/AbstractJSONSourceFormatter.java index eabc11a..8d320bd 100644 --- a/bundles/org.eclipse.wst.json.core/src/org/eclipse/wst/json/core/internal/format/AbstractJSONSourceFormatter.java +++ b/bundles/org.eclipse.wst.json.core/src/org/eclipse/wst/json/core/internal/format/AbstractJSONSourceFormatter.java
@@ -660,13 +660,15 @@ } String getLineDelimiter(IJSONNode node) { - IJSONModel model = (node != null) ? node.getOwnerDocument().getModel() - : null; - return (model != null) ? model.getStructuredDocument() - .getLineDelimiter() : "\n"; //$NON-NLS-1$ - - // TODO : check whether to use model.getLineDelimiter() or - // model.getStructuredDocument().getLineDelimiter() + IJSONModel model = node != null ? + node.getOwnerDocument().getModel() : + null; + IStructuredDocument structuredDocument = model != null ? + model.getStructuredDocument() : + null; + return structuredDocument != null ? + structuredDocument.getLineDelimiter() : + "\n"; //$NON-NLS-1$ } protected CompoundRegion[] getOutsideRegions(IStructuredDocument model,