geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcco...@apache.org
Subject svn commit: r661461 - /geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/DependencyHelper.java
Date Thu, 29 May 2008 20:18:06 GMT
Author: mcconne
Date: Thu May 29 13:18:06 2008
New Revision: 661461

URL: http://svn.apache.org/viewvc?rev=661461&view=rev
Log:
GERONIMODEVTOOLS-347 Handle case where dependency is not included in list of modules being
deployed

Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/DependencyHelper.java

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/DependencyHelper.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/DependencyHelper.java?rev=661461&r1=661460&r2=661461&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/DependencyHelper.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/DependencyHelper.java
Thu May 29 13:18:06 2008
@@ -119,7 +119,7 @@
         for (int ii=0; ii<modules.size(); ii++) {
             IModule[] module = (IModule[]) modules.get(ii);
             int moduleDeltaKind = ((Integer)deltaKind.get(ii)).intValue();
-            if (!reorderedModules.contains(module)) {
+            if (module!=null && !reorderedModules.contains(module)) {
                 // Not already moved 
                 if (moduleDeltaKind == ServerBehaviourDelegate.REMOVED) {
                     // Move module if going to be removed 
@@ -317,7 +317,7 @@
                 // Move self 
                 IModule[] module = getModule(artifact);
                 int moduleDeltaKind = getDeltaKind(artifact);
-                if (!reorderedModules.contains(module)) {
+                if (module!=null && !reorderedModules.contains(module)) {
                     reorderedModules.add(module);
                     reorderedKinds.add(moduleDeltaKind);
                 }
@@ -326,7 +326,7 @@
                 // Move parent
                 IModule[] module = getModule(artifact);
                 int moduleDeltaKind = getDeltaKind(artifact);
-                if (!reorderedModules.contains(module)) {
+                if (module!=null && !reorderedModules.contains(module)) {
                     reorderedModules.add(module);
                     reorderedKinds.add(moduleDeltaKind);
                 }



Mime
View raw message