[181271] Better tracing
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ModuleArtifactAdapter.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ModuleArtifactAdapter.java
index 82b9d74..e0e8c86 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ModuleArtifactAdapter.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ModuleArtifactAdapter.java
@@ -180,7 +180,7 @@
try {
return getDelegate().getModuleArtifacts(obj);
} catch (Exception e) {
- Trace.trace(Trace.SEVERE, "Error calling delegate " + toString() + ": " + e.getMessage());
+ Trace.trace(Trace.SEVERE, "Error calling delegate " + toString(), e);
return null;
}
}
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/actions/RunOnServerActionDelegate.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/actions/RunOnServerActionDelegate.java
index 0403863..8dff8d5 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/actions/RunOnServerActionDelegate.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/actions/RunOnServerActionDelegate.java
@@ -158,8 +158,12 @@
* Run the resource on a server.
*/
protected void run() {
-// final String launchMode2 = getLaunchMode();
IModuleArtifact[] moduleArtifacts = ServerPlugin.getModuleArtifacts(selection);
+ if (moduleArtifacts == null || moduleArtifacts.length == 0 || moduleArtifacts[0] == null) {
+ EclipseUtil.openError(Messages.errorNoArtifact);
+ Trace.trace(Trace.FINEST, "No module artifact found");
+ return;
+ }
// TODO - multiple module artifacts
final IModuleArtifact moduleArtifact = moduleArtifacts[0];
@@ -177,11 +181,6 @@
}
final Shell shell = shell2;
- if (moduleArtifact == null) {
- EclipseUtil.openError(Messages.errorNoArtifact);
- Trace.trace(Trace.FINEST, "No module artifact found");
- return;
- }
if (moduleArtifact.getModule() == null) { // 149425
EclipseUtil.openError(Messages.errorNoModules);
Trace.trace(Trace.FINEST, "Module artifact not contained in a module");
