Bug 462949 - NPE in XMLJavaHyperlinkDetector.detectHyperlinks

Issue is fixed by adding a null-check for a region value returned by selectQualifiedName(...) (can return null)

Signed-off-by: vrubezhny <vrubezhny@exadel.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/hyperlink/XMLJavaHyperlinkDetector.java b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/hyperlink/XMLJavaHyperlinkDetector.java
index d640e1c015..615b5d58de 100644
--- a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/hyperlink/XMLJavaHyperlinkDetector.java
+++ b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/hyperlink/XMLJavaHyperlinkDetector.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2008, 2013 IBM Corporation and others.

+ * Copyright (c) 2008, 2015 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

@@ -230,7 +230,8 @@ public class XMLJavaHyperlinkDetector extends AbstractHyperlinkDetector {
 			IDocument document = textViewer.getDocument();

 			// find hyperlink range for Java element

 			IRegion hyperlinkRegion = region.getLength() > 0 ? region : selectQualifiedName(document, region.getOffset());

-			if (isJspJavaContent(document, hyperlinkRegion)) { // Handled by JSPJavaHyperlinkDetector

+			if (hyperlinkRegion == null || // Bug #462949 - Because selectQualifiedName may return null

+					isJspJavaContent(document, hyperlinkRegion)) { // Handled by JSPJavaHyperlinkDetector

 				return null;

 			}

 			String name = null;