You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by sh...@apache.org on 2008/04/16 09:46:55 UTC
svn commit: r648588 -
/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java
Author: shivahr
Date: Wed Apr 16 00:46:53 2008
New Revision: 648588
URL: http://svn.apache.org/viewvc?rev=648588&view=rev
Log:
GERONIMODEVTOOLS-178 Deadlock while stopping Geronimo server from within Eclipse - Now fixed in WTP itself - Hence undoing the earlier patch.
Modified:
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java?rev=648588&r1=648587&r2=648588&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java Wed Apr 16 00:46:53 2008
@@ -171,27 +171,23 @@
* @see org.eclipse.wst.server.core.model.ServerBehaviourDelegate#stop(boolean)
*/
synchronized public void stop(final boolean force) {
- new Thread() {
- public void run() {
- Trace.trace(Trace.INFO, "--> stop()");
- stopPingThread();
- if (getServer().getServerState() != IServer.STATE_STOPPED) {
- setServerState(IServer.STATE_STOPPING);
- stopKernel();
- }
- GeronimoConnectionFactory.getInstance().destroy(getServer());
- if (force) {
- terminate();
- return;
- }
- int state = getServer().getServerState();
- if (state == IServer.STATE_STOPPED)
- return;
- if (state == IServer.STATE_STARTING || state == IServer.STATE_STOPPING)
- terminate();
- Trace.trace(Trace.INFO, "<-- stop()");
- }
- }.start();
+ Trace.trace(Trace.INFO, "--> stop()");
+ stopPingThread();
+ if (getServer().getServerState() != IServer.STATE_STOPPED) {
+ setServerState(IServer.STATE_STOPPING);
+ stopKernel();
+ }
+ GeronimoConnectionFactory.getInstance().destroy(getServer());
+ if (force) {
+ terminate();
+ return;
+ }
+ int state = getServer().getServerState();
+ if (state == IServer.STATE_STOPPED)
+ return;
+ if (state == IServer.STATE_STARTING || state == IServer.STATE_STOPPING)
+ terminate();
+ Trace.trace(Trace.INFO, "<-- stop()");
}
/*
Re: svn commit: r648588 - /geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java
Posted by Jacek Laskowski <ja...@laskowski.net.pl>.
On Wed, Apr 16, 2008 at 12:13 PM, Shiva Kumar H R <sh...@gmail.com> wrote:
> Oh! I shld have mentioned that it is available starting from WTP 2.0.1 (and
> we mention WTP 2.0.2 as the pre-req for GEP 2.0.1).
GEP seems to be the source of information about Eclipse and its
ecosystem so this and other information help a lot to stay up-to-date.
Thanks.
Jacek
--
Jacek Laskowski
http://www.JacekLaskowski.pl
Re: svn commit: r648588 - /geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java
Posted by Shiva Kumar H R <sh...@gmail.com>.
On Wed, Apr 16, 2008 at 3:18 PM, Jacek Laskowski <ja...@laskowski.net.pl>
wrote:
> On Wed, Apr 16, 2008 at 9:46 AM, <sh...@apache.org> wrote:
> > Author: shivahr
> > Date: Wed Apr 16 00:46:53 2008
> > New Revision: 648588
> >
> > URL: http://svn.apache.org/viewvc?rev=648588&view=rev
> > Log:
> > GERONIMODEVTOOLS-178 Deadlock while stopping Geronimo server from
> within Eclipse - Now fixed in WTP itself - Hence undoing the earlier patch.
>
> Well, but it does require using the latest (patched) WTP, doesn't it?
> It's not available in the stable release, I guess.
>
Oh! I shld have mentioned that it is available starting from WTP 2.0.1 (and
we mention WTP 2.0.2 as the pre-req for GEP 2.0.1).
> Jacek
>
> --
> Jacek Laskowski
> http://www.JacekLaskowski.pl
>
--
Thanks,
Shiva
Re: svn commit: r648588 - /geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java
Posted by Jacek Laskowski <ja...@laskowski.net.pl>.
On Wed, Apr 16, 2008 at 9:46 AM, <sh...@apache.org> wrote:
> Author: shivahr
> Date: Wed Apr 16 00:46:53 2008
> New Revision: 648588
>
> URL: http://svn.apache.org/viewvc?rev=648588&view=rev
> Log:
> GERONIMODEVTOOLS-178 Deadlock while stopping Geronimo server from within Eclipse - Now fixed in WTP itself - Hence undoing the earlier patch.
Well, but it does require using the latest (patched) WTP, doesn't it?
It's not available in the stable release, I guess.
Jacek
--
Jacek Laskowski
http://www.JacekLaskowski.pl