Commit 730b6e39 authored by Jay Jay Billings's avatar Jay Jay Billings
Browse files

Fixed the remaining build bugs from the matdb service refactor.


Signed-off-by: default avatarJay Jay Billings <billingsjj@ornl.gov>
parent b1f478cd
......@@ -266,13 +266,17 @@ public class Core extends Application implements ICore, BundleActivator {
* This operation configures the Materials database.
*/
private void getMaterialsDatabase() {
// Grab the service interface
matDBServiceRef = bundleContext
.getServiceReference(IMaterialsDatabase.class);
// Get the service
IMaterialsDatabase database = bundleContext.getService(matDBServiceRef);
// This should probably be delegated through the ItemManager.
AbstractModelBuilder.setMaterialsDatabase(database);
if (bundleContext != null) {
// Grab the service interface
matDBServiceRef = bundleContext
.getServiceReference(IMaterialsDatabase.class);
// Get the service
IMaterialsDatabase database = bundleContext
.getService(matDBServiceRef);
// This should probably be delegated through the ItemManager.
AbstractModelBuilder.setMaterialsDatabase(database);
}
return;
}
......
......@@ -6,9 +6,7 @@ bin.includes = META-INF/,\
schema/,\
OSGi-INF/MOOSEIO.xml,\
OSGi-INF/jobLauncherRemote.xml,\
OSGi-INF/mooseModelRemote.xml,\
OSGi-INF/materialsDBComponent.xml,\
OSGi-INF/materialsDBComponent.xml
OSGi-INF/mooseModelRemote.xml
output.. = bin/
src.includes = pom.xml
source.. = src/
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment