From 440f02b9c35973a07c838461101f1e7d96be21ca Mon Sep 17 00:00:00 2001 From: David McKnight Date: Sat, 5 Apr 2008 19:22:05 +0000 Subject: [PATCH] [225175] fix how disconnect is done - there will always be a systemservice manager --- .../src/org/eclipse/dstore/core/miners/Miner.java | 2 +- .../org/eclipse/dstore/core/server/ConnectionEstablisher.java | 2 +- .../src/org/eclipse/dstore/core/server/Server.java | 4 ++-- .../dstore/internal/core/server/ServerCommandHandler.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/miners/Miner.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/miners/Miner.java index cd83cdba413..fd4bd4e4f1f 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/miners/Miner.java +++ b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/miners/Miner.java @@ -306,7 +306,7 @@ implements ISchemaExtender _dataStore.trace(er); _dataStore.finish(); - if (SystemServiceManager.getInstance() == null) + if (SystemServiceManager.getInstance().getSystemService() == null) System.exit(-1); } } 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 2ad4f058ade..f10170616dc 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 @@ -191,7 +191,7 @@ public class ConnectionEstablisher _dataStore.finish(); System.out.println(ServerReturnCodes.RC_FINISHED); - if (SystemServiceManager.getInstance() == null) + if (SystemServiceManager.getInstance().getSystemService() == null) System.exit(0); } } diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/Server.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/Server.java index d8ff3d97029..51ad4aebe80 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/Server.java +++ b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/Server.java @@ -66,7 +66,7 @@ public class Server implements Runnable { // version is bad System.err.println(ServerReturnCodes.RC_JRE_VERSION_ERROR); - if (SystemServiceManager.getInstance() == null) + if (SystemServiceManager.getInstance().getSystemService() == null) System.exit(-1); } } @@ -74,7 +74,7 @@ public class Server implements Runnable { // version is bad System.err.println(ServerReturnCodes.RC_JRE_VERSION_ERROR); - if (SystemServiceManager.getInstance() == null) + if (SystemServiceManager.getInstance().getSystemService() == null) System.exit(-1); } diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerCommandHandler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerCommandHandler.java index 633d788ea75..2aa8b210861 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerCommandHandler.java +++ b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerCommandHandler.java @@ -65,7 +65,7 @@ public class ServerCommandHandler extends CommandHandler System.out.println(ServerReturnCodes.RC_FINISHED); // only exit if there's no service manager - if (SystemServiceManager.getInstance() == null) + if (SystemServiceManager.getInstance().getSystemService() == null) System.exit(0); } }