[jbosstools-commits] JBoss Tools SVN: r9457 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.

[jbosstools-commits at lists.jboss.org]

Author: rob.stryker at jboss.com
Date: 2008-07-31 13:04:50 -0400 (Thu, 31 Jul 2008)
New Revision: 9457

Modified:
   trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java
Log:
JBIDE-2410

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java	2008-07-31 15:51:10 UTC (rev 9456)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java	2008-07-31 17:04:50 UTC (rev 9457)
@@ -62,21 +62,23 @@
 		// here we update the launch configuration with any details that might have changed. 
 		try {
 			Server s = (Server)getServer();
-			ILaunchConfiguration lc = s.getLaunchConfiguration(true, new NullProgressMonitor());
-			String startArgs = lc.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, (String)null);
-			String originalArgs = startArgs;
-			if( !getServer().getHost().equals(getHost(true)))
-				startArgs = ArgsUtil.setArg(startArgs, "-b", "--host", getServer().getHost());
-			
-			IJBossServerRuntime runtime = (IJBossServerRuntime)
-				getServer().getRuntime().loadAdapter(IJBossServerRuntime.class, null);
-			String config = runtime.getJBossConfiguration();
-			startArgs = ArgsUtil.setArg(startArgs, "-c", "--configuration", config);
-			
-			if( !startArgs.equals(originalArgs)) {
-				ILaunchConfigurationWorkingCopy wc = lc.getWorkingCopy();
-				wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, startArgs);
-				wc.doSave();
+			ILaunchConfiguration lc = s.getLaunchConfiguration(false, new NullProgressMonitor());
+			if( lc != null ) {
+				String startArgs = lc.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, (String)null);
+				String originalArgs = startArgs;
+				if( !getServer().getHost().equals(getHost(true)))
+					startArgs = ArgsUtil.setArg(startArgs, "-b", "--host", getServer().getHost());
+				
+				IJBossServerRuntime runtime = (IJBossServerRuntime)
+					getServer().getRuntime().loadAdapter(IJBossServerRuntime.class, null);
+				String config = runtime.getJBossConfiguration();
+				startArgs = ArgsUtil.setArg(startArgs, "-c", "--configuration", config);
+				
+				if( startArgs != null && !startArgs.equals(originalArgs)) {
+					ILaunchConfigurationWorkingCopy wc = lc.getWorkingCopy();
+					wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, startArgs);
+					wc.doSave();
+				}
 			}
 		} catch( CoreException ce )  {
 			IStatus s = new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "Could not save server's start arguments", ce);