geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From de...@apache.org
Subject svn commit: r799490 - /geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/DeploymentUtils.java
Date Fri, 31 Jul 2009 02:11:16 GMT
Author: delos
Date: Fri Jul 31 02:11:15 2009
New Revision: 799490

URL: http://svn.apache.org/viewvc?rev=799490&view=rev
Log:
GERONIMODEVTOOLS-580  Servlet/JSP update forces a complete redeploy of a WAR.
Avoid exception in getAffectedJSPFiles() of DeploymentUtils, in case not only jsp files changed

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

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/DeploymentUtils.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/DeploymentUtils.java?rev=799490&r1=799489&r2=799490&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/DeploymentUtils.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/DeploymentUtils.java
Fri Jul 31 02:11:15 2009
@@ -246,10 +246,12 @@
             else return null;   //not only jsp changed
         }
         else if (resource instanceof IModuleFolder) {
-            IModuleResourceDelta[] deltaArray = delta.getAffectedChildren();
-            for (IModuleResourceDelta childDelta: deltaArray) {
-                fileList.addAll(getAffectedJSPFiles(childDelta));
-            }
+             IModuleResourceDelta[] deltaArray = delta.getAffectedChildren();
+			 for (IModuleResourceDelta childDelta : deltaArray) {
+				List<IModuleResourceDelta> deltaChildren = getAffectedJSPFiles(childDelta);
+				if (deltaChildren != null) fileList.addAll(deltaChildren);
+				else return null;
+			}
         }
 
         return fileList;



Mime
View raw message