svn commit: r1600624 - /sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java

[rombert]

Author: rombert
Date: Thu Jun  5 12:13:22 2014
New Revision: 1600624

URL: http://svn.apache.org/r1600624
Log:
SLING-3645 - Ignore publish requests if the server is stopped

Modified:
    
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java

Modified: 
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java?rev=1600624&r1=1600623&r2=1600624&view=diff
==============================================================================
--- 
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
 (original)
+++ 
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
 Thu Jun  5 12:13:22 2014
@@ -148,6 +148,12 @@ public class SlingLaunchpadBehaviour ext
 
         logger.trace(traceOperation(kind, deltaKind, module));
 
+        if (getServer().getServerState() == IServer.STATE_STOPPED) {
+            logger.trace("Ignoring request to publish module when the server 
is stopped");
+            setModulePublishState(module, IServer.PUBLISH_STATE_NONE);
+            return;
+        }
+
         if ((kind == IServer.PUBLISH_AUTO || kind == 
IServer.PUBLISH_INCREMENTAL)
                 && deltaKind == ServerBehaviourDelegate.NO_CHANGE) {
             logger.trace("Ignoring request to publish the module when no 
resources have changed; most likely another module has changed");
@@ -230,6 +236,28 @@ public class SlingLaunchpadBehaviour ext
                 break;
         }
 
+        switch (getServer().getServerState()) {
+            case IServer.STATE_STARTED:
+                trace.append("STARTED, ");
+                break;
+
+            case IServer.STATE_STARTING:
+                trace.append("STARTING, ");
+                break;
+
+            case IServer.STATE_STOPPED:
+                trace.append("STOPPED, ");
+                break;
+
+            case IServer.STATE_STOPPING:
+                trace.append("STOPPING, ");
+                break;
+
+            default:
+                trace.append("UNKONWN - 
").append(getServer().getServerState()).append(", ");
+                break;
+        }
+
         trace.append(Arrays.toString(module)).append(")");
 
         return trace.toString();
@@ -393,7 +421,7 @@ public class SlingLaunchpadBehaviour ext
         if (file == null) {
             // Usually happens on server startup, it seems to be safe to 
ignore for now
             Activator.getDefault().getPluginLogger()
-                    .trace("Got null '{0}' and '{1}' for {2}", 
IFile.class.getSimpleName(),
+                    .trace("Got null {0} and {1} for {2}", 
IFile.class.getSimpleName(),
                             IFolder.class.getSimpleName(), resource);
             return null;
         }