From c31d9d32138d7bb2fb407545e0e21d1489922ade Mon Sep 17 00:00:00 2001
From: Brett Meyer <brett@3riverdev.com>
Date: Wed, 25 Sep 2013 14:21:15 -0400
Subject: [PATCH] HHH-8502 synchronize AuditConfiguration#destroy

---
 .../envers/configuration/AuditConfiguration.java       | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/AuditConfiguration.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/AuditConfiguration.java
index e5c0e7e7f9..126b3d3cea 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/AuditConfiguration.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/AuditConfiguration.java
@@ -185,10 +185,12 @@ public synchronized static AuditConfiguration getFor(Configuration cfg, ClassLoa
 	}
 
 	public void destroy() {
-		for ( Map.Entry<Configuration, AuditConfiguration> c : new HashSet<Map.Entry<Configuration, AuditConfiguration>>(
-				cfgs.entrySet() ) ) {
-			if ( c.getValue() == this ) { // this is nasty cleanup fix, whole static CFGS should be reworked
-				cfgs.remove( c.getKey() );
+		synchronized ( AuditConfiguration.class ) {
+			for ( Map.Entry<Configuration, AuditConfiguration> c : new HashSet<Map.Entry<Configuration, AuditConfiguration>>(
+					cfgs.entrySet() ) ) {
+				if ( c.getValue() == this ) { // this is nasty cleanup fix, whole static CFGS should be reworked
+					cfgs.remove( c.getKey() );
+				}
 			}
 		}
 		classLoaderService = null;