From 119d7c5588d9a110a6b5ceb83aebebd7aa42fa2f Mon Sep 17 00:00:00 2001 From: David McKnight Date: Tue, 9 Jan 2007 19:56:08 +0000 Subject: [PATCH] cleanup a couple dstore things --- .../src/org/eclipse/dstore/core/model/UpdateHandler.java | 2 +- .../org/eclipse/dstore/core/server/ConnectionEstablisher.java | 1 - .../org/eclipse/dstore/core/server/ServerCommandHandler.java | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/UpdateHandler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/UpdateHandler.java index 97d9187901d..72a5cf9c6a9 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/UpdateHandler.java +++ b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/UpdateHandler.java @@ -138,7 +138,7 @@ public abstract class UpdateHandler extends Handler else { - if (_dataStore != null && object != null) + if (_dataStore != null && object != null && !object.isDeleted()) { if (object.getType().equals(DataStoreResources.model_status)) { diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ConnectionEstablisher.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ConnectionEstablisher.java index 6647289fe95..1d2e3d4aa2f 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ConnectionEstablisher.java +++ b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ConnectionEstablisher.java @@ -340,7 +340,6 @@ public class ConnectionEstablisher _dataStore.setSSLProperties(sslProperties); DataElement ticket = _dataStore.getTicket(); - System.out.println("ticket="+ticketStr); //$NON-NLS-1$ ticket.setAttribute(DE.A_NAME, ticketStr); _updateHandler.setDataStore(_dataStore); diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerCommandHandler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerCommandHandler.java index 27c25afb271..bfa5d10cbe5 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerCommandHandler.java +++ b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerCommandHandler.java @@ -198,7 +198,6 @@ public class ServerCommandHandler extends CommandHandler String commandSource = command.getSource(); String commandName = command.getName(); - if (commandName.equals(DataStoreSchema.C_VALIDATE_TICKET)) { DataElement serverTicket = _dataStore.getTicket();