Author: adietish Date: 2011-07-13 10:42:10 -0400 (Wed, 13 Jul 2011) New Revision: 32892 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.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/JBoss7ManagerServicePoller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2011-07-13 13:50:31 UTC (rev 32891) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2011-07-13 14:42:10 UTC (rev 32892) @@ -61,7 +61,6 @@ } public boolean isComplete() throws PollingException, RequiresInfoException { - IJBoss7ManagerService service = null; try { if (expectedState == SERVER_DOWN) { return awaitShutdown(service); @@ -70,8 +69,6 @@ } } catch (Exception e) { throw new PollingException(e.getMessage()); - } finally { - disposeService(service); } } @@ -101,28 +98,18 @@ } } - private void disposeService(IJBoss7ManagerService service) { - if (service != null) { - service.dispose(); - } - } - public boolean getState() throws PollingException, RequiresInfoException { - IJBoss7ManagerService service = null; try { - service = JBoss7ManagerUtil.getService(getServer()); JBoss7ServerState serverState = service.getServerState(getServer().getHost(), getManagementPort()); return serverState == JBoss7ServerState.RUNNING || serverState == JBoss7ServerState.RESTART_REQUIRED; } catch (Exception e) { throw new PollingException(e.getMessage()); - } finally { - disposeService(service); } } public void cleanup() { - service.dispose(); + JBoss7ManagerUtil.dispose(service); } public List<String> getRequiredProperties() { 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:50:31 UTC (rev 32891) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java 2011-07-13 14:42:10 UTC (rev 32892) @@ -46,18 +46,14 @@ @Override protected IStatus gracefullStop() { IServer server = getServer(); - IJBoss7ManagerService service = null; try { - service = getService(); JBoss7Server jbossServer = ServerConverter.checkedGetJBossServer(server, JBoss7Server.class); - service.stop(jbossServer.getHost(), jbossServer.getManagementPort()); + getService().stop(jbossServer.getHost(), jbossServer.getManagementPort()); return Status.OK_STATUS; } catch (Exception e) { return new Status( IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, MessageFormat.format(Messages.JBoss7ServerBehavior_could_not_stop, server.getName()), e); - } finally { - JBoss7ManagerUtil.dispose(service); } }