Prevent NullPointerException in configgen (#325)

fixes #316
googleapis · Aug 3, 2016 · 116ed6c · 116ed6c
1 parent c170078
commit 116ed6c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/main/java/com/google/api/codegen/config/CollectionPattern.java b/src/main/java/com/google/api/codegen/config/CollectionPattern.java
@@ -111,9 +111,11 @@ public String getTemplatizedResourcePath() {
   public static List<CollectionPattern> getCollectionPatternsFromMethod(Method method) {
     List<CollectionPattern> collectionPatterns = new LinkedList<CollectionPattern>();
     HttpAttribute httpAttr = method.getAttribute(HttpAttribute.KEY);
-    for (PathSegment pathSegment : httpAttr.getPath()) {
-      if (CollectionPattern.isValidCollectionPattern(pathSegment)) {
-        collectionPatterns.add(CollectionPattern.create((FieldSegment) pathSegment));
+    if (httpAttr != null) {
+      for (PathSegment pathSegment : httpAttr.getPath()) {
+        if (CollectionPattern.isValidCollectionPattern(pathSegment)) {
+          collectionPatterns.add(CollectionPattern.create((FieldSegment) pathSegment));
+        }
       }
     }
     return collectionPatterns;

diff --git a/src/main/java/com/google/api/codegen/config/RetryGenerator.java b/src/main/java/com/google/api/codegen/config/RetryGenerator.java
@@ -102,6 +102,9 @@ public Map<String, Object> generate(Method method) {
    */
   private static boolean isIdempotent(Method method) {
     HttpAttribute httpAttr = method.getAttribute(HttpAttribute.KEY);
+    if (httpAttr == null) {
+      return false;
+    }
     MethodKind methodKind = httpAttr.getMethodKind();
     return methodKind.isIdempotent();
   }