Merge branch 'master' into fix-issue-282-273

Azure · Apr 23, 2020 · be6106e · be6106e
2 parents 7d288b5 + 09f3888
commit be6106e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 node_modules/
 dist/
 .vscode/
+.vs/
 package-lock.json
 tmpoutput
 .history

diff --git a/src/plugins/azgenerator/CodeModelAzImpl.ts b/src/plugins/azgenerator/CodeModelAzImpl.ts
@@ -615,8 +615,7 @@ export class CodeModelCliImpl implements CodeModelAz {
     }
 
     public get Command_GetOriginalOperation(): any {
-        let oriOp = this.Command.extensions['cli-poly-as-resource-original-operation'];
-        return oriOp;
+        return this.Command.extensions?.['cli-poly-as-resource-original-operation'];
     }
 
     public get Command_IsLongRun(): boolean {
@@ -742,8 +741,7 @@ export class CodeModelCliImpl implements CodeModelAz {
     }
 
     public get Method_GetOriginalOperation(): any {
-        let oriOp = this.Method.extensions['cli-poly-as-resource-original-operation'];
-        return oriOp;
+        return this.Method.extensions?.['cli-poly-as-resource-original-operation'];
     }
     //=================================================================================================================
     // Methods Parameters.

diff --git a/src/plugins/merger.ts b/src/plugins/merger.ts
@@ -21,7 +21,7 @@ export class Merger {
         this.codeModel.operationGroups.forEach(operationGroup => {
             let operations = operationGroup.operations;
             operationGroup.operations.forEach(operation => {
-                if(!isNullOrUndefined(operation.extensions['cli-operations'])) {
+                if (!isNullOrUndefined(operation.extensions) && !isNullOrUndefined(operation.extensions['cli-operations'])) {
                     operations = operations.concat(operation.extensions['cli-operations']);
                 }
             });