Author: adietish Date: 2011-07-13 09:50:31 -0400 (Wed, 13 Jul 2011) New Revision: 32891 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerUtil.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java Log: [JBIDE-9337] corrected service creation to be lazy since actual behaviour is only set after instantiation Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerUtil.java 2011-07-13 13:24:03 UTC (rev 32890) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerUtil.java 2011-07-13 13:50:31 UTC (rev 32891) @@ -16,7 +16,7 @@ import org.osgi.framework.BundleContext; public class JBoss7ManagerUtil { - + private static final String JBOSS7_RUNTIME = "org.jboss.ide.eclipse.as.runtime.70"; //$NON-NLS-1$ public static IJBoss7ManagerService getService(IServer server) throws Exception { @@ -28,7 +28,7 @@ private static String getRequiredVersion(IServer server) { String id = server.getRuntime().getRuntimeType().getId(); - if (JBOSS7_RUNTIME.equals(id)) { + if (JBOSS7_RUNTIME.equals(id)) { return IJBoss7ManagerService.AS_VERSION_700; } return null; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java 2011-07-13 13:24:03 UTC (rev 32890) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java 2011-07-13 13:50:31 UTC (rev 32891) @@ -27,10 +27,6 @@ private IJBoss7ManagerService service; - public LocalJBoss7BehaviorDelegate() throws Exception { - this.service = JBoss7ManagerUtil.getService(getServer()); - } - public IStatus canChangeState(String launchMode) { return Status.OK_STATUS; } @@ -52,7 +48,7 @@ IServer server = getServer(); IJBoss7ManagerService service = null; try { - service = JBoss7ManagerUtil.getService(server); + service = getService(); JBoss7Server jbossServer = ServerConverter.checkedGetJBossServer(server, JBoss7Server.class); service.stop(jbossServer.getHost(), jbossServer.getManagementPort()); return Status.OK_STATUS; @@ -81,6 +77,17 @@ @Override public void dispose() { - JBoss7ManagerUtil.dispose(service); + try { + JBoss7ManagerUtil.dispose(getService()); + } catch(Exception e) { + // ignore + } } + + protected IJBoss7ManagerService getService() throws Exception { + if (service == null) { + this.service = JBoss7ManagerUtil.getService(getServer()); + } + return service; + } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java 2011-07-13 13:24:03 UTC (rev 32890) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java 2011-07-13 13:50:31 UTC (rev 32891) @@ -33,10 +33,6 @@ private IJBoss7ManagerService service; - public RSEJBoss7BehaviourDelegate() throws Exception { - this.service = JBoss7ManagerUtil.getService(getServer()); - } - @Override protected String getShutdownCommand(IServer server) throws CoreException { String defaultCommand = ServerUtil.checkedGetBehaviorDelegate(server).getDefaultStopArguments(); @@ -57,8 +53,10 @@ @Override protected IStatus gracefullStop() { IServer server = getServer(); + IJBoss7ManagerService service = null; try { JBoss7Server jbossServer = ServerConverter.checkedGetJBossServer(server, JBoss7Server.class); + service = getService(); service.stop(jbossServer.getHost(), jbossServer.getManagementPort()); return Status.OK_STATUS; } catch (Exception e) { @@ -69,6 +67,17 @@ } public void dispose() { - JBoss7ManagerUtil.dispose(service); + try { + JBoss7ManagerUtil.dispose(getService()); + } catch(Exception e) { + // ignore + } } + + protected IJBoss7ManagerService getService() throws Exception { + if (service == null) { + this.service = JBoss7ManagerUtil.getService(getServer()); + } + return service; + } }