factory registration duplicates ignored

laforge49 · Dec 15, 2012 · dca57ce · dca57ce
1 parent 195f515
commit dca57ce
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>org.agilewiki.jactor</groupId>
     <artifactId>jactor</artifactId>
-    <version>4.5.0</version>
+    <version>4.5.1</version>
     <packaging>jar</packaging>
     <name>JActor</name>
     <description>Lock-free Java Actors</description>

diff --git a/src/main/java/org/agilewiki/jactor/factory/JAFactory.java b/src/main/java/org/agilewiki/jactor/factory/JAFactory.java
@@ -194,7 +194,8 @@ public void defineActorType(String actorType, Class clazz)
     public void registerActorFactory(ActorFactory actorFactory)
             throws Exception {
         String actorType = actorFactory.actorType;
-        if (types.containsKey(actorType))
+        ActorFactory old = types.get(actorType);
+        if (old != null && !old.equals(actorFactory))
             throw new IllegalArgumentException("Actor type is already defined: " + actorType);
         types.put(actorType, actorFactory);
     }