[jbosstools-commits] JBoss Tools SVN: r14103 - in branches/jbosstools-3.0.x: jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server and 1 other directory.
Author: max.andersen(a)jboss.com
Date: 2009-03-09 07:47:59 -0400 (Mon, 09 Mar 2009)
New Revision: 14103
Modified:
branches/jbosstools-3.0.x/
branches/jbosstools-3.0.x/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server/RegistrationHelper.java
Log:
Merged revisions 14102 via svnmerge from
https://svn.jboss.org/repos/jbosstools/trunk
........
r14102 | max.andersen(a)jboss.com | 2009-03-09 12:22:28 +0100 (Mon, 09 Mar 2009) | 1 line
added null/empty checks for JBIDE-3972
........
Property changes on: branches/jbosstools-3.0.x
___________________________________________________________________
Name: svnmerge-integrated
- /trunk:1-13898,14088 /branches/ganymede:1-7797 /branches/ganymede/trunk:1-8005
/branches/jbosstools-2.1.x:1-7998,8009-8012,8078-8079
+ /trunk:1-13898,14088,14102 /branches/ganymede:1-7797 /branches/ganymede/trunk:1-8005
/branches/jbosstools-2.1.x:1-7998,8009-8012,8078-8079
Modified:
branches/jbosstools-3.0.x/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server/RegistrationHelper.java
===================================================================
---
branches/jbosstools-3.0.x/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server/RegistrationHelper.java 2009-03-09
11:22:28 UTC (rev 14102)
+++
branches/jbosstools-3.0.x/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server/RegistrationHelper.java 2009-03-09
11:47:59 UTC (rev 14103)
@@ -192,14 +192,14 @@
// There may be a few modules for resources from the same project.
// Ignore module with jboss.singlefile type if there are other module types.
IModule[] modules = ServerUtil.getModules(project);
- if(modules.length>0) {
+ if(modules != null && modules.length>0) {
for (int i = 0; i < modules.length; i++) {
if(!"jboss.singlefile".equals(modules[i].getModuleType().getId())) {
return modules[i];
}
}
}
- return modules[0];
+ return null;
}
public static void runRegisterInServerJob(IProject p, IServer server) {