From 11122cae8067b99218ec8dbb6242eed62fb4e6d9 Mon Sep 17 00:00:00 2001
From: Max Medvedev <maxim.medvedev@jetbrains.com>
Date: Fri, 7 Dec 2012 09:16:01 +0400
Subject: [PATCH] fix NPE in Groovy stubs

---
 .../plugins/groovy/lang/psi/stubs/GrStubUtils.java       | 9 ++++++++-
 .../lang/psi/stubs/elements/GrStubFileElementType.java   | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/GrStubUtils.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/GrStubUtils.java
index 7c58e14399f0..c02dc8aa30cb 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/GrStubUtils.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/GrStubUtils.java
@@ -16,6 +16,8 @@
 
 package org.jetbrains.plugins.groovy.lang.psi.stubs;
 
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiModifier;
 import com.intellij.psi.PsiModifierList;
 import com.intellij.psi.PsiModifierListOwner;
@@ -41,10 +43,12 @@ import java.util.List;
  * Date: 02.06.2009
  */
 public class GrStubUtils {
+  private static final Logger LOG = Logger.getInstance(GrStubUtils.class);
 
   public static void writeStringArray(StubOutputStream dataStream, String[] array) throws IOException {
     dataStream.writeByte(array.length);
     for (String s : array) {
+      LOG.assertTrue(s != null);
       dataStream.writeName(s);
     }
   }
@@ -81,7 +85,10 @@ public class GrStubUtils {
     final PsiModifierList modifierList = psi.getModifierList();
     if (modifierList instanceof GrModifierList) {
       for (GrAnnotation annotation : ((GrModifierList)modifierList).getAnnotations()) {
-        annoNames.add(annotation.getShortName());
+        final String name = annotation.getShortName();
+        if (StringUtil.isNotEmpty(name)) {
+          annoNames.add(name);
+        }
       }
     }
     return ArrayUtil.toStringArray(annoNames);
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/elements/GrStubFileElementType.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/elements/GrStubFileElementType.java
index 49949256761d..222c8025e052 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/elements/GrStubFileElementType.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/elements/GrStubFileElementType.java
@@ -55,7 +55,7 @@ public class GrStubFileElementType extends IStubFileElementType<GrFileStub> {
 
   @Override
   public int getStubVersion() {
-    return super.getStubVersion() + 15;
+    return super.getStubVersion() + 16;
   }
 
   public String getExternalId() {