using Guice instead of relying on an internal class of XStream

jenkinsci · Sep 5, 2013 · 0775a70 · 0775a70
1 parent 8b2e148
commit 0775a70
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/database/jpa/PersistenceService.java b/src/main/java/org/jenkinsci/plugins/database/jpa/PersistenceService.java
@@ -1,6 +1,6 @@
 package org.jenkinsci.plugins.database.jpa;
 
-import com.thoughtworks.xstream.core.util.ConcurrentWeakHashMap;
+import com.google.common.collect.MapMaker;
 import hudson.Extension;
 import hudson.model.TopLevelItem;
 import jenkins.model.Jenkins;
@@ -40,7 +40,7 @@ public class PersistenceService {
 
     private final AtomicReference<EMFCache<Database>> globalCache = new AtomicReference<EMFCache<Database>>();
     private final ConcurrentMap<TopLevelItem,EMFCache<PerItemDatabase>> perItemCache =
-            new ConcurrentWeakHashMap<TopLevelItem, EMFCache<PerItemDatabase>>();
+            new MapMaker().weakKeys().makeMap();
 
     public EntityManagerFactory createEntityManagerFactory(DataSource dataSource, List<Class> classes) {
         return new HibernatePersistence().createContainerEntityManagerFactory(new PersistenceUnitInfoImpl(