From 9e81f5ff60dca59cfd31ba8a1cef5df509411024 Mon Sep 17 00:00:00 2001
From: Dani Megert
Date: Fri, 14 Oct 2016 12:03:22 +0200
Subject: Fixed bug 505958: [implementation]
 org.eclipse.jface.text.TextUtilities.getDefaultLineDelimiter(IDocument) can
 return null

---
 .../src/org/eclipse/jface/text/TextUtilities.java            | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'org.eclipse.text')

diff --git a/org.eclipse.text/src/org/eclipse/jface/text/TextUtilities.java b/org.eclipse.text/src/org/eclipse/jface/text/TextUtilities.java
index df2e9ad5029..9ccd5e9ab05 100644
--- a/org.eclipse.text/src/org/eclipse/jface/text/TextUtilities.java
+++ b/org.eclipse.text/src/org/eclipse/jface/text/TextUtilities.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2015 IBM Corporation and others.
+ * Copyright (c) 2000, 2016 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -481,12 +481,14 @@ public class TextUtilities {
 	 * @since 3.0
 	 */
 	public static String getDefaultLineDelimiter(IDocument document) {
-
-		if (document instanceof IDocumentExtension4)
-			return ((IDocumentExtension4)document).getDefaultLineDelimiter();
-
 		String lineDelimiter= null;
 
+		if (document instanceof IDocumentExtension4) {
+			lineDelimiter= ((IDocumentExtension4) document).getDefaultLineDelimiter();
+			if (lineDelimiter != null)
+				return lineDelimiter;
+		}
+
 		try {
 			lineDelimiter= document.getLineDelimiter(0);
 		} catch (BadLocationException x) {
-- 
cgit v1.2.3