[testng] 151/160: ConcurrentHashMap doesn't accept null values.

[Eugene Zhukov]

This is an automated email from the git hooks/post-receive script.

eugene-guest pushed a commit to annotated tag testng-6.9.5
in repository testng.

commit 4a3bf1e6f5c8accb88af99ef0c43343109089a94
Author: Cedric Beust <cedric at beust.com>
Date:   Fri Jul 10 08:09:57 2015 -0700

    ConcurrentHashMap doesn't accept null values.
---
 .../java/org/testng/internal/annotations/JDK15AnnotationFinder.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/org/testng/internal/annotations/JDK15AnnotationFinder.java b/src/main/java/org/testng/internal/annotations/JDK15AnnotationFinder.java
index fc8cd02..2de11c7 100755
--- a/src/main/java/org/testng/internal/annotations/JDK15AnnotationFinder.java
+++ b/src/main/java/org/testng/internal/annotations/JDK15AnnotationFinder.java
@@ -194,6 +194,10 @@ public class JDK15AnnotationFinder implements IAnnotationFinder {
   private <A extends IAnnotation> A findAnnotation(Class cls, Annotation a,
       Class<A> annotationClass, Class<?> testClass,
       Constructor<?> testConstructor, Method testMethod, Pair<Annotation, ?> p) {
+    if (a == null) {
+      return null;
+    }
+
     IAnnotation result = m_annotations.get(p);
     if (result == null) {
       result = m_tagFactory.createTag(cls, a, annotationClass, m_transformer);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/testng.git