From 04b48200260a076df7c0182c2f388d96a5b96b92 Mon Sep 17 00:00:00 2001
From: SDK Automation <sdkautomation@microsoft.com>
Date: Thu, 27 Feb 2020 01:08:42 +0000
Subject: [PATCH] Generated from 65a829591d3c9b82c32455e2b743a6f5482e767f

Merge branch 'master' of https://github.com/Azure/azure-rest-api-specs into getSubscription_IncludeTags
---
 sdk/locks/mgmt-v2016_09_01/pom.xml                     |  6 ++++--
 .../implementation/ManagementLocksImpl.java            | 10 +++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/sdk/locks/mgmt-v2016_09_01/pom.xml b/sdk/locks/mgmt-v2016_09_01/pom.xml
index 053d0d6b7d0b2..fda6e54aa3442 100644
--- a/sdk/locks/mgmt-v2016_09_01/pom.xml
+++ b/sdk/locks/mgmt-v2016_09_01/pom.xml
@@ -11,11 +11,11 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.3.0</version>
+        <version>1.1.0</version>
         <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-locks</artifactId>
-    <version>1.0.0-beta-3</version>
+    <version>1.0.0-beta</version>
     <packaging>jar</packaging>
     <name>Microsoft Azure SDK for Authorization Management</name>
     <description>This package contains Microsoft Authorization Management SDK.</description>
@@ -71,6 +71,8 @@
             <artifactId>azure-arm-client-runtime</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
+            <!--Below version for test jar needs to be removed, this will be done as part of v1-runtime 1.6.7-->
+            <version>1.6.5</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/sdk/locks/mgmt-v2016_09_01/src/main/java/com/microsoft/azure/management/locks/v2016_09_01/implementation/ManagementLocksImpl.java b/sdk/locks/mgmt-v2016_09_01/src/main/java/com/microsoft/azure/management/locks/v2016_09_01/implementation/ManagementLocksImpl.java
index 4ca0f80c12c30..c4e51236b7b79 100644
--- a/sdk/locks/mgmt-v2016_09_01/src/main/java/com/microsoft/azure/management/locks/v2016_09_01/implementation/ManagementLocksImpl.java
+++ b/sdk/locks/mgmt-v2016_09_01/src/main/java/com/microsoft/azure/management/locks/v2016_09_01/implementation/ManagementLocksImpl.java
@@ -244,10 +244,14 @@ public ManagementLockObject getByResourceGroup(String resourceGroupName, String
 
     @Override
     public Observable<ManagementLockObject> getByResourceGroupAsync(String resourceGroupName, String name) {
-        return this.getInnerAsync(resourceGroupName, name).map(new Func1<ManagementLockObjectInner, ManagementLockObject> () {
+        return this.getInnerAsync(resourceGroupName, name).flatMap(new Func1<ManagementLockObjectInner, Observable<ManagementLockObject>> () {
             @Override
-            public ManagementLockObject call(ManagementLockObjectInner innerT) {
-                return wrapModel(innerT);
+            public Observable<ManagementLockObject> call(ManagementLockObjectInner innerT) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((ManagementLockObject)wrapModel(innerT));
+                }
             }
         });
     }