From 33da766f63f78a04878892cb53a8bad963523a59 Mon Sep 17 00:00:00 2001 From: Nate Jensen Date: Fri, 1 Mar 2013 10:48:03 -0600 Subject: [PATCH] Issue #1744 actually fix deadlock this time Change-Id: I9c5468d4d7d8fe19e709bc9cce42f06ca60d3eeb Former-commit-id: 8c84bc5fbb4d1a636d66acb815afe38a3d934f5a [formerly 56d6dd7fb0d16ef5fdb545e816fedddb28273024] Former-commit-id: 35007e04602fe42d06dd946e5f9a70ce3ef0569a --- .../raytheon/uf/common/serialization/SerializationCache.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationCache.java b/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationCache.java index 09b4a6a59a..395d6d8ffc 100644 --- a/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationCache.java +++ b/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationCache.java @@ -106,7 +106,7 @@ public class SerializationCache { // and will block other threads, meanwhile deeper inside create() // it needs to obtain a lock on the classloader which another thread // might already have - synchronized (SerializationCache.class) { + synchronized (SerializationCache.class.getClassLoader()) { bm = generator.create(); } generator.setBean(null);