Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Phillips2014-01-14 14:39:24 -0500
committerDavid Phillips2014-01-14 14:39:24 -0500
commitf5bd29c2d50df026d275c7a72b82c1a7083cba9f (patch)
tree2c5a92fd0a9e3456c3640602b40fd3710bcaf514
parent2c5ecc6a1bb149ed59879fe7e690f5e4f24aa3f8 (diff)
downloadorg.eclipse.osee-0.16.0.v201401142128_RC.tar.gz
org.eclipse.osee-0.16.0.v201401142128_RC.tar.xz
org.eclipse.osee-0.16.0.v201401142128_RC.zip
refinement: Catch exception at shutdown0.16.0.v201401220039_REL0.16.0.v201401142128_RC
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/environment/TestEnvironment.java14
1 files changed, 9 insertions, 5 deletions
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/environment/TestEnvironment.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/environment/TestEnvironment.java
index a128fb0e09..99d610c16e 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/environment/TestEnvironment.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/environment/TestEnvironment.java
@@ -145,8 +145,8 @@ public abstract class TestEnvironment implements TestEnvironmentInterface, ITest
oteServerSideEndpointSender = new OteServerSideEndpointSender(this);
BundleContext context = Platform.getBundle("org.eclipse.osee.ote.core").getBundleContext();
return getServiceTracker(MessagingGateway.class.getName(), new OteEnvironmentTrackerCustomizer(context,
- oteServerSideEndpointRecieve, oteServerSideEndpointSender,
- OteServerSideEndpointSender.OTE_SERVER_SIDE_SEND_PROTOCOL));
+ oteServerSideEndpointRecieve, oteServerSideEndpointSender,
+ OteServerSideEndpointSender.OTE_SERVER_SIDE_SEND_PROTOCOL));
}
public void sendCommand(Command command) {
@@ -313,10 +313,10 @@ public abstract class TestEnvironment implements TestEnvironmentInterface, ITest
throw new IOException("Failed to create the output directory");
}
OseeLog.logf(TestEnvironment.class, Level.INFO,
- "Outfile Dir [%s] created.", outDir.getAbsolutePath());
+ "Outfile Dir [%s] created.", outDir.getAbsolutePath());
} else {
OseeLog.logf(TestEnvironment.class, Level.FINE,
- "Outfile Dir [%s] exists.", outDir.getAbsolutePath());
+ "Outfile Dir [%s] exists.", outDir.getAbsolutePath());
}
} else {
throw new IOException("A valid outfile directory must be specified.");
@@ -372,7 +372,11 @@ public abstract class TestEnvironment implements TestEnvironmentInterface, ITest
}
protected void stop() {
- myRegistration.unregister();
+ try {
+ myRegistration.unregister();
+ } catch (IllegalStateException ex) {
+ // Service may have already been unregistered, but we don't care
+ }
}
protected void cleanupClassReferences() {

Back to the top