From 268d275ba1a6b4e9f0bc4a429b56a2571b869e24 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Tue, 8 Apr 2008 18:57:58 +0000 Subject: [PATCH] [225902] [dstore] RSE download hangs --- .../rse/connectorservice/dstore/util/StatusMonitor.java | 4 +++- .../rse/services/dstore/util/DStoreStatusMonitor.java | 4 +++- .../eclipse/rse/services/dstore/util/DownloadListener.java | 5 +++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/StatusMonitor.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/StatusMonitor.java index b526480baae..d96e9a6514c 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/StatusMonitor.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/StatusMonitor.java @@ -13,6 +13,7 @@ * * Contributors: * Martin Oberhuber (Wind River) - [168870] refactor org.eclipse.rse.core package of the UI plugin + * David McKnight (IBM) - [225902] [dstore] use C_NOTIFICATION command to wake up the server *******************************************************************************/ package org.eclipse.rse.connectorservice.dstore.util; @@ -24,6 +25,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.dstore.core.model.DE; import org.eclipse.dstore.core.model.DataElement; import org.eclipse.dstore.core.model.DataStore; +import org.eclipse.dstore.core.model.DataStoreSchema; import org.eclipse.dstore.extra.DomainEvent; import org.eclipse.dstore.extra.IDomainListener; import org.eclipse.rse.core.subsystems.CommunicationsEvent; @@ -394,7 +396,7 @@ public class StatusMonitor implements IDomainListener, ICommunicationsListener if (status != null) { // token command to wake up update handler - DataElement cmdDescriptor = _dataStore.findCommandDescriptor("C_REFRESH"); //$NON-NLS-1$ + DataElement cmdDescriptor = _dataStore.findCommandDescriptor(DataStoreSchema.C_NOTIFICATION); DataElement subject = status.getParent().get(0); if (cmdDescriptor != null) { diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/util/DStoreStatusMonitor.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/util/DStoreStatusMonitor.java index 1a41122cd58..c515c0df3ff 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/util/DStoreStatusMonitor.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/util/DStoreStatusMonitor.java @@ -16,6 +16,7 @@ * David McKnight (IBM) - [190010] When status is "cancelled" the wait should complete * David McKnight (IBM) - [197480] eliminating UI dependencies * David McKnight (IBM) - [209593] [api] check for existing query to avoid duplicates + * David McKnight (IBM) - [225902] [dstore] use C_NOTIFICATION command to wake up the server *******************************************************************************/ package org.eclipse.rse.services.dstore.util; @@ -27,6 +28,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.dstore.core.model.DE; import org.eclipse.dstore.core.model.DataElement; import org.eclipse.dstore.core.model.DataStore; +import org.eclipse.dstore.core.model.DataStoreSchema; import org.eclipse.dstore.extra.DomainEvent; import org.eclipse.dstore.extra.IDomainListener; import org.eclipse.dstore.extra.IDomainNotifier; @@ -338,7 +340,7 @@ public class DStoreStatusMonitor implements IDomainListener if (status != null) { // token command to wake up update handler - DataElement cmdDescriptor = _dataStore.findCommandDescriptor("C_REFRESH"); //$NON-NLS-1$ + DataElement cmdDescriptor = _dataStore.findCommandDescriptor(DataStoreSchema.C_NOTIFICATION); DataElement subject = status.getParent().get(0); if (cmdDescriptor != null) { diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/util/DownloadListener.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/util/DownloadListener.java index 536ab3da0c3..8f8e4c4d22c 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/util/DownloadListener.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/util/DownloadListener.java @@ -17,7 +17,7 @@ * David McKnight (IBM) - [216252] MessageFormat.format -> NLS.bind * Martin Oberhuber (Wind River) - [219952] Use MessageFormat for download progress message * David McKnight (IBM) - [222448] [dstore] update DownloadListener to handle timeouts and nudge - * David McKnight (IBM) - [225902] [dstore] RSE download hangs + * David McKnight (IBM) - [225902] [dstore] use C_NOTIFICATION command to wake up the server ********************************************************************************/ package org.eclipse.rse.services.dstore.util; @@ -31,6 +31,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.dstore.core.model.DE; import org.eclipse.dstore.core.model.DataElement; import org.eclipse.dstore.core.model.DataStore; +import org.eclipse.dstore.core.model.DataStoreSchema; import org.eclipse.dstore.extra.DomainEvent; import org.eclipse.dstore.extra.IDomainListener; import org.eclipse.rse.internal.services.dstore.ServiceResources; @@ -287,7 +288,7 @@ public class DownloadListener implements IDomainListener if (status != null) { // token command to wake up update handler - DataElement cmdDescriptor = _dataStore.findCommandDescriptor("C_REFRESH"); //$NON-NLS-1$ + DataElement cmdDescriptor = _dataStore.findCommandDescriptor(DataStoreSchema.C_NOTIFICATION); DataElement subject = status.getParent().get(0); if (cmdDescriptor != null) {