From 410d9913e1cb84d84b79c9b8161564394a4cbc23 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Thu, 23 Nov 2006 17:54:01 +0000 Subject: [PATCH] [164202] fix for manual connection - need to handle null ticket case --- .../eclipse/dstore/core/server/ServerCommandHandler.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 e30aa68e881..2a0ef961851 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 @@ -197,8 +197,7 @@ public class ServerCommandHandler extends CommandHandler String commandSource = command.getSource(); String commandName = command.getName(); - _dataStore.trace("command: " + commandName); - //System.out.println(commandName); + System.out.println(commandName); if (commandName.equals(DataStoreSchema.C_VALIDATE_TICKET)) @@ -207,7 +206,8 @@ public class ServerCommandHandler extends CommandHandler DataElement clientTicket = command.get(0); String st = serverTicket.getName(); String ct = clientTicket.getName(); - if (ct.equals(st)) + + if (st == null || st.equals("null") || ct.equals(st)) { serverTicket.setAttribute(DE.A_VALUE,DataStoreResources.model_valid); clientTicket.setAttribute(DE.A_VALUE,DataStoreResources.model_valid); @@ -230,7 +230,7 @@ public class ServerCommandHandler extends CommandHandler } else if (commandName.equals(DataStoreSchema.C_SET)) { - DataElement dataObject = command.get(0); + //DataElement dataObject = command.get(0); status.setAttribute(DE.A_NAME,DataStoreResources.model_done); } else if (commandName.equals(DataStoreSchema.C_MODIFY))