fixed weird nullpoint w/@tsundberg

isidore · isidore · commit c74d5018f495 · 2015-08-19T12:32:20.000-07:00
diff --git a/java/org/approvaltests/ReporterFactory.java b/java/org/approvaltests/ReporterFactory.java
@@ -78,7 +78,10 @@ private static <T extends Annotation> T getAnnotationFromStackTrace(Class<T> ann
         annotation = method.getAnnotation(annotationClass);
       }
       if (annotation != null) { return annotation; }
-      annotation = clazz.getAnnotation(annotationClass);
+      if (clazz != null)
+      {
+        annotation = clazz.getAnnotation(annotationClass);
+      }
       if (annotation != null) { return annotation; }
     }
     return null;

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,10 @@ private static <T extends Annotation> T getAnnotationFromStackTrace(Class<T> ann`
`78`	`78`	`annotation = method.getAnnotation(annotationClass);`
`79`	`79`	`}`
`80`	`80`	`if (annotation != null) { return annotation; }`
`81`		`- annotation = clazz.getAnnotation(annotationClass);`
	`81`	`+ if (clazz != null)`
	`82`	`+ {`
	`83`	`+ annotation = clazz.getAnnotation(annotationClass);`
	`84`	`+ }`
`82`	`85`	`if (annotation != null) { return annotation; }`
`83`	`86`	`}`
`84`	`87`	`return null;`