tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject svn commit: r1292186 - /openejb/trunk/maven-plugins/dd-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/dd/merger/EjbJarMerger.java
Date Wed, 22 Feb 2012 08:43:26 GMT
Author: rmannibucau
Date: Wed Feb 22 08:43:26 2012
New Revision: 1292186

URL: http://svn.apache.org/viewvc?rev=1292186&view=rev
Log:
removing stupid check for container transaction and container concurrency merge

Modified:
    openejb/trunk/maven-plugins/dd-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/dd/merger/EjbJarMerger.java

Modified: openejb/trunk/maven-plugins/dd-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/dd/merger/EjbJarMerger.java
URL: http://svn.apache.org/viewvc/openejb/trunk/maven-plugins/dd-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/dd/merger/EjbJarMerger.java?rev=1292186&r1=1292185&r2=1292186&view=diff
==============================================================================
--- openejb/trunk/maven-plugins/dd-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/dd/merger/EjbJarMerger.java
(original)
+++ openejb/trunk/maven-plugins/dd-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/dd/merger/EjbJarMerger.java
Wed Feb 22 08:43:26 2012
@@ -83,33 +83,11 @@ public class EjbJarMerger extends Merger
         }
 
         for (ContainerTransaction tx : descriptor.getContainerTransaction()) {
-            boolean found = false;
-            for (ContainerTransaction refTx : reference.getContainerTransaction()) {
-                if (refTx.getId().equals(tx.getId())) { // is id the good test?
-                    found = true;
-                    break;
-                }
-            }
-            if (found) {
-                log.warn("container transaction " + tx.getId() + " already defined");
-            } else {
-                reference.getContainerTransaction().add(tx);
-            }
+            reference.getContainerTransaction().add(tx);
         }
 
         for (ContainerConcurrency concurrency : descriptor.getContainerConcurrency()) {
-            boolean found = false;
-            for (ContainerConcurrency refConcurrency : reference.getContainerConcurrency())
{
-                if (refConcurrency.getId().equals(concurrency.getId())) { // is id the good
test?
-                    found = true;
-                    break;
-                }
-            }
-            if (found) {
-                log.warn("container concurrency " + concurrency.getId() + " already defined");
-            } else {
-                reference.getContainerConcurrency().add(concurrency);
-            }
+            reference.getContainerConcurrency().add(concurrency);
         }
 
         for (InterceptorBinding interceptorBinding : descriptor.getInterceptorBinding())
{



Mime
View raw message