362681 - ConcurrentModificationException while generating JAXB classes - change HashMap to Hashtable

2 files changed, 6 insertions, 6 deletions

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/AbstractJaxbContextRoot.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/AbstractJaxbContextRoot.java
index cfce93aefe..aff0abde76 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/AbstractJaxbContextRoot.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/AbstractJaxbContextRoot.java
@@ -9,8 +9,8 @@
  ******************************************************************************/
 package org.eclipse.jpt.jaxb.core.internal.context;
 
-import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -66,8 +66,8 @@ public abstract class AbstractJaxbContextRoot
 			throw new NullPointerException();
 		}
 		this.jaxbProject = jaxbProject;
-		this.packages = new HashMap<String, JaxbPackage>();
-		this.types = new HashMap<String, JaxbType>();
+		this.packages = new Hashtable<String, JaxbPackage>();
+		this.types = new Hashtable<String, JaxbType>();
 		initialize();
 	}
 	
@@ -451,7 +451,7 @@ public abstract class AbstractJaxbContextRoot
 	}
 	
 	public JaxbType getType(String typeName) {
-		return this.types.get(typeName);
+		return typeName == null ? null : this.types.get(typeName);
 	}
 	
 	protected void addType_(JaxbType type) {
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaClassMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaClassMapping.java
index db1db3521d..3455a95878 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaClassMapping.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaClassMapping.java
@@ -9,8 +9,8 @@
  *******************************************************************************/
 package org.eclipse.jpt.jaxb.core.internal.context.java;
 
-import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -82,7 +82,7 @@ public class GenericJavaClassMapping
 	
 	public GenericJavaClassMapping(JaxbClass parent) {
 		super(parent);
-		this.includedAttributesContainers = new HashMap<JaxbClassMapping, JaxbAttributesContainer>();
+		this.includedAttributesContainers = new Hashtable<JaxbClassMapping, JaxbAttributesContainer>();
 		this.propOrderContainer = new PropOrderContainer();
 		
 		initFactoryClass();