Merge "Fixed Blocker issues. IssueId: SO-165"

[so.git] / common / src / main / java / org / openecomp / mso / yangDecoder / transform / impl / TransformJava2XMLFactory.java

diff --git a/common/src/main/java/org/openecomp/mso/yangDecoder/transform/impl/TransformJava2XMLFactory.java b/common/src/main/java/org/openecomp/mso/yangDecoder/transform/impl/TransformJava2XMLFactory.java
index f1c98c8..8595988 100644 (file)
--- a/common/src/main/java/org/openecomp/mso/yangDecoder/transform/impl/TransformJava2XMLFactory.java
+++ b/common/src/main/java/org/openecomp/mso/yangDecoder/transform/impl/TransformJava2XMLFactory.java
@@ -57,20 +57,28 @@ public class TransformJava2XMLFactory 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);
+        
 
     }