1 files changed, 33 insertions, 6 deletions

diff --git a/common/src/main/java/org/openecomp/mso/yangDecoder/transform/impl/TransformJava2JsonFactory.java b/common/src/main/java/org/openecomp/mso/yangDecoder/transform/impl/TransformJava2JsonFactory.java
index 647b3038bb..b99cd1a843 100644
--- a/common/src/main/java/org/openecomp/mso/yangDecoder/transform/impl/TransformJava2JsonFactory.java
+++ b/common/src/main/java/org/openecomp/mso/yangDecoder/transform/impl/TransformJava2JsonFactory.java
@@ -1,3 +1,23 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
 package org.openecomp.mso.yangDecoder.transform.impl;
 
 import javassist.ClassPool;
@@ -37,21 +57,28 @@ public class TransformJava2JsonFactory  extends TYangJsonXmlBase {
     @Override
     protected void setupWithDataBroker(final DataBroker dataBroker) {
         // Intentionally left No-op, subclasses may customize it
-        mappingservice = new BindingToNormalizedNodeCodec(GeneratedClassLoadingStrategy.getTCCLClassLoadingStrategy(),
-                new BindingNormalizedNodeCodecRegistry(StreamWriterGenerator.create(JavassistUtils.forClassPool(ClassPool.getDefault()))));
-        moduleInfoBackedContext = ModuleInfoBackedContext.create();
+        
         // moduleInfoBackedContext.registerModuleInfo(BindingReflections.getModuleInfo(SncTunnels.class));
 
         try {
+        	mappingservice = new BindingToNormalizedNodeCodec(GeneratedClassLoadingStrategy.getTCCLClassLoadingStrategy(),
+                    new BindingNormalizedNodeCodecRegistry(StreamWriterGenerator.create(JavassistUtils.forClassPool(ClassPool.getDefault()))));
+            moduleInfoBackedContext = ModuleInfoBackedContext.create();
+            
             for (YangModuleInfo yangModuleInfo : getModuleInfos()) {
                 moduleInfoBackedContext.registerModuleInfo(yangModuleInfo);
             }
+            schemaContext = moduleInfoBackedContext.tryToCreateSchemaContext().get();
+            mappingservice.onGlobalContextUpdated(schemaContext);
+            controllerContext.setSchemas(schemaContext);
         } catch (Exception e) {
             e.printStackTrace();
+        } finally {
+        	if(null != mappingservice){
+        		mappingservice.close();
+        	}
         }
-        schemaContext = moduleInfoBackedContext.tryToCreateSchemaContext().get();
-        mappingservice.onGlobalContextUpdated(schemaContext);
-        controllerContext.setSchemas(schemaContext);
+        
 
     }