You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2008/07/24 22:27:47 UTC
svn commit: r679529 -
/openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/org.eclipse.jst.server.generic.openejb/src/main/java/org/apache/openejb/eclipse/server/OpenEJBServerBehaviour.java
Author: jgallimore
Date: Thu Jul 24 13:27:47 2008
New Revision: 679529
URL: http://svn.apache.org/viewvc?rev=679529&view=rev
Log:
OPENEJB-864 fixed error message when stopping server in Eclipse 3.4
Modified:
openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/org.eclipse.jst.server.generic.openejb/src/main/java/org/apache/openejb/eclipse/server/OpenEJBServerBehaviour.java
Modified: openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/org.eclipse.jst.server.generic.openejb/src/main/java/org/apache/openejb/eclipse/server/OpenEJBServerBehaviour.java
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/org.eclipse.jst.server.generic.openejb/src/main/java/org/apache/openejb/eclipse/server/OpenEJBServerBehaviour.java?rev=679529&r1=679528&r2=679529&view=diff
==============================================================================
--- openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/org.eclipse.jst.server.generic.openejb/src/main/java/org/apache/openejb/eclipse/server/OpenEJBServerBehaviour.java (original)
+++ openejb/trunk/sandbox/openejb-eclipse-plugin/plugins/org.eclipse.jst.server.generic.openejb/src/main/java/org/apache/openejb/eclipse/server/OpenEJBServerBehaviour.java Thu Jul 24 13:27:47 2008
@@ -66,8 +66,7 @@
while (true) {
try {
Thread.sleep(ONE_SECOND);
- } catch (InterruptedException e) {
- stopServer();
+ } catch (Exception e) {
}
try {
@@ -101,22 +100,6 @@
}
// if success, server is running
}
-
- /*
- * @see org.apache.openejb.server.admin.AdminDaemon.service(Socket socket)
- */
- private void stopServer() {
- // connect to admin interface, and send 'Q' to stop the server
- try {
- Socket socket = new Socket("localhost", 4200);
- socket.getOutputStream().write('Q');
- socket.close();
-
- setState(IServer.STATE_STOPPING);
- } catch (IOException e) {
- // we're really stuck
- }
- }
public void terminate() {
this.interrupt();
@@ -131,13 +114,26 @@
@Override
public void stop(boolean force) {
- if (monitor == null) {
- return;
+ stopServer();
+ }
+
+ /*
+ * @see org.apache.openejb.server.admin.AdminDaemon.service(Socket socket)
+ */
+ private void stopServer() {
+ // connect to admin interface, and send 'Q' to stop the server
+ try {
+ Socket socket = new Socket("localhost", 4200);
+ socket.getOutputStream().write('Q');
+ socket.close();
+
+ setState(IServer.STATE_STOPPING);
+ } catch (IOException e) {
+ // we're really stuck
}
-
- monitor.terminate();
}
+
@Override
public void setupLaunchConfiguration(ILaunchConfigurationWorkingCopy workingCopy, IProgressMonitor monitor) throws CoreException {
workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, "org.apache.openejb.cli.Bootstrap");