From ffe2935a833eb47c445723842050df59d0027f17 Mon Sep 17 00:00:00 2001
From: "Denis.Zhdanov" <Denis.Zhdanov@jetbrains.com>
Date: Mon, 17 Oct 2011 12:42:48 +0400
Subject: [PATCH] EA-29950 - CCE: PsiFieldImpl.getDocComment

---
 .../src/com/intellij/psi/impl/source/PsiFieldImpl.java       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiFieldImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiFieldImpl.java
index b7f9d11a8f88..59d36dd23e3d 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiFieldImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiFieldImpl.java
@@ -347,9 +347,10 @@ public class PsiFieldImpl extends JavaStubPsiElement<PsiFieldStub> implements Ps
   public PsiDocComment getDocComment(){
     CompositeElement treeElement = getNode();
     if (getTypeElement() != null) {
-      return (PsiDocComment)treeElement.findChildByRoleAsPsiElement(ChildRole.DOC_COMMENT);
+      PsiElement element = treeElement.findChildByRoleAsPsiElement(ChildRole.DOC_COMMENT);
+      return element instanceof PsiDocComment ? (PsiDocComment)element : null;
     }
-    else{
+    else {
       ASTNode prevField = treeElement.getTreePrev();
       while(prevField.getElementType() != JavaElementType.FIELD){
         prevField = prevField.getTreePrev();