[SDNC-5] summary

Synchronized source code with 17.07 after cleaning up deprecated code

Change-Id: Ieabd58d25bb405ad15ad255e1cf40797e91d937f
Signed-off-by: Rich Tabedzki <richard.tabedzki@att.com>

1 files changed, 11 insertions, 0 deletions

diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIServiceActivator.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIServiceActivator.java
index 261a0c7..b00748b 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIServiceActivator.java
+++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIServiceActivator.java
@@ -55,6 +55,8 @@ public class AAIServiceActivator implements BundleActivator {
 	@Override
 	public void start(BundleContext ctx) throws Exception {
 
+		System.setProperty("aaiclient.runtime", "OSGI");
+
 		String sdnConfigDirectory = System.getenv(SDNC_CONFIG_DIR);
 
 		// check SDNC CONFIG DIR system property
@@ -210,8 +212,17 @@ public class AAIServiceActivator implements BundleActivator {
 
 		for(ServiceRegistration registration : localRegistrationSet) {
 			if (registration != null) {
+				try {
+					AAIService aaiService = (AAIService)ctx.getService(registration.getReference());
 				registration.unregister();
 				registrationSet.remove(registration);
+					if(aaiService != null) {
+						aaiService.cleanUp();
+					}
+				} catch(Exception exc) {
+					if(LOG.isDebugEnabled())
+						LOG.debug(exc.getMessage());
+				}
 			}
 		}
 	}