geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r1135730 - in /geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core: GeronimoServerBehaviourDelegate.java internal/Messages.java internal/Messages.properties
Date Tue, 14 Jun 2011 18:10:44 GMT
Author: gawor
Date: Tue Jun 14 18:10:44 2011
New Revision: 1135730

URL: http://svn.apache.org/viewvc?rev=1135730&view=rev
Log:
minor improvment

Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerBehaviourDelegate.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/internal/Messages.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/internal/Messages.properties

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerBehaviourDelegate.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerBehaviourDelegate.java?rev=1135730&r1=1135729&r2=1135730&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerBehaviourDelegate.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerBehaviourDelegate.java
Tue Jun 14 18:10:44 2011
@@ -755,15 +755,16 @@ abstract public class GeronimoServerBeha
     protected void terminate() {
         Trace.tracePoint("Entry", Activator.traceCore, "GeronimoServerBehaviourDelegate.terminate");
 
-        if (getServer().getServerState() == IServer.STATE_STOPPED)
+        if (getServer().getServerState() == IServer.STATE_STOPPED) {
             return;
+        }
 
+        setServerState(IServer.STATE_STOPPING);
+        Trace.trace(Trace.INFO, "Killing the geronimo server process", Activator.traceCore);
//$NON-NLS-1$
+        
         try {
-            setServerState(IServer.STATE_STOPPING);
-            Trace.trace(Trace.INFO, "Killing the geronimo server process", Activator.traceCore);
//$NON-NLS-1$
             if (process != null && !process.isTerminated()) {
                 process.terminate();
-
             }
             stopImpl();
         } catch (Exception e) {
@@ -771,7 +772,7 @@ abstract public class GeronimoServerBeha
             // 
             // WTP does not allow a CoreException to be thrown in this case 
             // 
-            throw new RuntimeException(Messages.STOP_FAIL);
+            throw new RuntimeException(Messages.serverStopFailed);
         }
 
         Trace.tracePoint("Exit ", Activator.traceCore, "GeronimoServerBehaviourDelegate.terminate");

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/internal/Messages.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/internal/Messages.java?rev=1135730&r1=1135729&r2=1135730&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/internal/Messages.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/internal/Messages.java
Tue Jun 14 18:10:44 2011
@@ -75,4 +75,6 @@ public class Messages extends NLS {
     
     public static String moduleExportError;
     
+    public static String serverStopFailed;
+    
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/internal/Messages.properties
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/internal/Messages.properties?rev=1135730&r1=1135729&r2=1135730&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/internal/Messages.properties
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/internal/Messages.properties
Tue Jun 14 18:10:44 2011
@@ -59,3 +59,5 @@ noDefaultServer=Invalid setup, no defaul
 
 moduleModified=Modified
 moduleExportError=Module {0} failed to export.
+
+serverStopFailed=Error stopping server.



Mime
View raw message