Author: adietish Date: 2011-07-05 05:00:31 -0400 (Tue, 05 Jul 2011) New Revision: 32597 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java Log: [JBIDE-9215] extracted duplicate checks for process to its own method (code gets more readable since method says what the check is all about) Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2011-07-05 08:59:27 UTC (rev 32596) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2011-07-05 09:00:31 UTC (rev 32597) @@ -63,7 +63,10 @@ } public void stop(boolean force) { int state = getServer().getServerState(); - if( force || process == null || process.isTerminated() || state == IServer.STATE_STOPPED || nextStopRequiresForce) { + if( force + || !isProcessRunning() + || state == IServer.STATE_STOPPED + || nextStopRequiresForce) { forceStop(); return; } @@ -94,7 +97,7 @@ IProcess stopProcess = waitForStopProcess(launch); if (stopProcess.getExitValue() == 0) { // TODO: correct concurrent access to process, pollThread and nextStopRequiresForce - if( process != null && !process.isTerminated() ) { + if( isProcessRunning() ) { getActualBehavior().setServerStarted(); pollThread.cancel(Messages.STOP_FAILED_MESSAGE); nextStopRequiresForce = true; @@ -126,7 +129,7 @@ @Override protected synchronized void forceStop() { // just terminate the process. - if( process != null && !process.isTerminated()) { + if( isProcessRunning()) { try { process.terminate(); addForceStopEvent(); @@ -189,6 +192,10 @@ DebugPlugin.getDefault().addDebugEventListener(processListener); } + private boolean isProcessRunning() { + return process != null + && process.isTerminated(); + } public void serverStarting() { nextStopRequiresForce = false;