mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-20 06:35:50 +02:00
Code Issues Wiki Activity

[164202] fix for manual connection - need to handle null ticket case

Browse source
This commit is contained in:
David McKnight 2006-11-23 17:54:01 +00:00
parent a34b4ba7d3
commit 410d9913e1
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerCommandHandler.java
View file

@ -197,8 +197,7 @@ public class ServerCommandHandler extends CommandHandler
String commandSource = command.getSource(); String commandSource = command.getSource();
String commandName = command.getName(); String commandName = command.getName();
_dataStore.trace("command: " + commandName); System.out.println(commandName);
//System.out.println(commandName);
if (commandName.equals(DataStoreSchema.C_VALIDATE_TICKET)) if (commandName.equals(DataStoreSchema.C_VALIDATE_TICKET))
@ -207,7 +206,8 @@ public class ServerCommandHandler extends CommandHandler
DataElement clientTicket = command.get(0); DataElement clientTicket = command.get(0);
String st = serverTicket.getName(); String st = serverTicket.getName();
String ct = clientTicket.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); serverTicket.setAttribute(DE.A_VALUE,DataStoreResources.model_valid);
clientTicket.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)) 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); status.setAttribute(DE.A_NAME,DataStoreResources.model_done);
} }
else if (commandName.equals(DataStoreSchema.C_MODIFY)) else if (commandName.equals(DataStoreSchema.C_MODIFY))