You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2011/07/07 17:18:30 UTC
svn commit: r1143879 -
/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/Module.java
Author: xuhaihong
Date: Thu Jul 7 15:18:30 2011
New Revision: 1143879
URL: http://svn.apache.org/viewvc?rev=1143879&view=rev
Log:
Update the comparing logic a bit, the non client modules are left unchanged
Modified:
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/Module.java
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/Module.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/Module.java?rev=1143879&r1=1143878&r2=1143879&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/Module.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/Module.java Thu Jul 7 15:18:30 2011
@@ -358,7 +358,15 @@ public abstract class Module<T, U> {
public int compare(Module<?, ?> m1, Module<?, ?> m2) {
boolean m1AppClientModule = m1 instanceof AppClientModule;
boolean m2AppClientModule = m2 instanceof AppClientModule;
- return m1AppClientModule && m2AppClientModule ? 0 : (m1AppClientModule ? -1 : 1);
+ if(m1AppClientModule && m2AppClientModule) {
+ return 0;
+ } else if(m1AppClientModule) {
+ return 1;
+ } else if(m2AppClientModule) {
+ return -1;
+ } else {
+ return 0;
+ }
}
}
}