Author: adietish Date: 2011-07-13 08:01:47 -0400 (Wed, 13 Jul 2011) New Revision: 32886 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IJBossBehaviourDelegate.java 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] proper service creation & disposal added to RSEJBoss7BehaviourDelegate and LocalJBoss7BehaviourDelegate Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java 2011-07-13 11:35:28 UTC (rev 32885) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java 2011-07-13 12:01:47 UTC (rev 32886) @@ -122,4 +122,8 @@ actualBehavior.setServerStarting(); } + @Override + public void dispose() { + // do nothing + } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java 2011-07-13 11:35:28 UTC (rev 32885) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java 2011-07-13 12:01:47 UTC (rev 32886) @@ -178,4 +178,9 @@ JSTPublisherXMLToucher.getInstance().touch(depPath, module[0], callback); } } + + @Override + public void dispose() { + getDelegate().dispose(); + } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IJBossBehaviourDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IJBossBehaviourDelegate.java 2011-07-13 11:35:28 UTC (rev 32885) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IJBossBehaviourDelegate.java 2011-07-13 12:01:47 UTC (rev 32886) @@ -33,5 +33,7 @@ public IStatus canChangeState(String launchMode); - public String getDefaultStopArguments() throws CoreException; + public String getDefaultStopArguments() throws CoreException; + + public void dispose(); } 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 11:35:28 UTC (rev 32885) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerUtil.java 2011-07-13 12:01:47 UTC (rev 32886) @@ -33,4 +33,10 @@ } return null; } + + public static void dispose(IJBoss7ManagerService service) { + if (service != null) { + service.dispose(); + } + } } 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 11:35:28 UTC (rev 32885) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java 2011-07-13 12:01:47 UTC (rev 32886) @@ -25,6 +25,12 @@ public class LocalJBoss7BehaviorDelegate extends LocalJBossBehaviorDelegate { + private IJBoss7ManagerService service; + + private LocalJBoss7BehaviorDelegate() throws Exception { + this.service = JBoss7ManagerUtil.getService(getServer()); + } + public IStatus canChangeState(String launchMode) { return Status.OK_STATUS; } @@ -44,8 +50,9 @@ @Override protected IStatus gracefullStop() { IServer server = getServer(); + IJBoss7ManagerService service = null; try { - IJBoss7ManagerService service = JBoss7ManagerUtil.getService(server); + service = JBoss7ManagerUtil.getService(server); JBoss7Server jbossServer = ServerConverter.checkedGetJBossServer(server, JBoss7Server.class); service.stop(jbossServer.getHost(), jbossServer.getManagementPort()); return Status.OK_STATUS; @@ -53,6 +60,8 @@ return new Status( IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, MessageFormat.format(Messages.JBoss7ServerBehavior_could_not_stop, server.getName()), e); + } finally { + JBoss7ManagerUtil.dispose(service); } } @@ -69,4 +78,9 @@ super.pollServer(expectedState); } } + + @Override + public void dispose() { + JBoss7ManagerUtil.dispose(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 11:35:28 UTC (rev 32885) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java 2011-07-13 12:01:47 UTC (rev 32886) @@ -31,6 +31,12 @@ public class RSEJBoss7BehaviourDelegate extends AbstractRSEBehaviourDelegate { + private IJBoss7ManagerService service; + + private RSEJBoss7BehaviourDelegate() throws Exception { + this.service = JBoss7ManagerUtil.getService(getServer()); + } + @Override protected String getShutdownCommand(IServer server) throws CoreException { String defaultCommand = ServerUtil.checkedGetBehaviorDelegate(server).getDefaultStopArguments(); @@ -52,7 +58,6 @@ protected IStatus gracefullStop() { IServer server = getServer(); try { - IJBoss7ManagerService service = JBoss7ManagerUtil.getService(server); JBoss7Server jbossServer = ServerConverter.checkedGetJBossServer(server, JBoss7Server.class); service.stop(jbossServer.getHost(), jbossServer.getManagementPort()); return Status.OK_STATUS; @@ -62,5 +67,8 @@ MessageFormat.format(Messages.JBoss7ServerBehavior_could_not_stop, server.getName()), e); } } - + + public void dispose() { + JBoss7ManagerUtil.dispose(service); + } }