From 3daad0009d5d37607ffdc8c45f6cd72f2adb27d7 Mon Sep 17 00:00:00 2001
From: Brian Devins-Suresh <brian.devinssuresh@datadoghq.com>
Date: Fri, 24 Jan 2020 10:58:52 -0500
Subject: [PATCH] Add null check to hibernate decorator

---
 .../trace/instrumentation/hibernate/HibernateDecorator.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dd-java-agent/instrumentation/hibernate/src/main/java/datadog/trace/instrumentation/hibernate/HibernateDecorator.java b/dd-java-agent/instrumentation/hibernate/src/main/java/datadog/trace/instrumentation/hibernate/HibernateDecorator.java
index b9cb30a859..eadd8999f8 100644
--- a/dd-java-agent/instrumentation/hibernate/src/main/java/datadog/trace/instrumentation/hibernate/HibernateDecorator.java
+++ b/dd-java-agent/instrumentation/hibernate/src/main/java/datadog/trace/instrumentation/hibernate/HibernateDecorator.java
@@ -47,6 +47,9 @@ public class HibernateDecorator extends OrmClientDecorator {
 
   @Override
   public String entityName(final Object entity) {
+    if (entity == null) {
+      return null;
+    }
     String name = null;
     final Set<String> annotations = new HashSet<>();
     for (final Annotation annotation : entity.getClass().getDeclaredAnnotations()) {