geronimo-scm mailing list archives

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

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

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

Modified: geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/DependencyHelper.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/DependencyHelper.java?rev=661463&r1=661462&r2=661463&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/DependencyHelper.java
(original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/DependencyHelper.java
Thu May 29 13:18:26 2008
@@ -128,7 +128,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 
@@ -229,7 +229,7 @@
                 processParents(dm.getParents(artifact), terminatingArtifact);
                 // Move self 
                 IModule[] module = getModule(artifact);
-                int moduleDeltaKind = getDeltaKind(artifact);
+                if (module!=null && !reorderedModules.contains(module)) {
                 if (!reorderedModules.contains(module)) {
                     reorderedModules.add(module);
                     reorderedKinds.add(moduleDeltaKind);
@@ -239,7 +239,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