Skip to content

Commit 3db53c8

Browse files
mgmt, bug fix, ResourceManager.httpPipeline not set (Azure#28111)
1 parent 30c7957 commit 3db53c8

File tree

4 files changed

+16
-3
lines changed

4 files changed

+16
-3
lines changed

sdk/resourcemanager/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ class VirtualMachineImpl
192192
private final Map<String, DeleteOptions> secondaryNetworkInterfaceDeleteOptions = new HashMap<>();
193193

194194
// Snapshot of the updateParameter when update() is called, used to compare whether there is modification to VM during updateResourceAsync
195-
VirtualMachineUpdateInner updateParameterSnapshotOnUpdate;
195+
private VirtualMachineUpdateInner updateParameterSnapshotOnUpdate;
196196
private static final SerializerAdapter SERIALIZER_ADAPTER =
197197
SerializerFactory.createDefaultManagementSerializerAdapter();
198198

@@ -229,7 +229,7 @@ class VirtualMachineImpl
229229
public VirtualMachineImpl update() {
230230
updateParameterSnapshotOnUpdate = this.deepCopyInnerToUpdateParameter();
231231
return super.update();
232-
};
232+
}
233233

234234
@Override
235235
public Mono<VirtualMachine> refreshAsync() {

sdk/resourcemanager/azure-resourcemanager-resources/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## 2.14.0-beta.1 (Unreleased)
44

5+
### Bugs Fixed
6+
7+
- Fixed a bug that `ResourceManager.pipeline()` be `null`.
8+
59
### Other Changes
610

711
#### Dependency Updates

sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/fluentcore/arm/Manager.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public abstract class Manager<InnerT> implements HasServiceClient<InnerT> {
1818
private ResourceManager resourceManager;
1919
private final String subscriptionId;
2020
private final AzureEnvironment environment;
21-
private final HttpPipeline httpPipeline;
21+
private HttpPipeline httpPipeline;
2222

2323
private final InnerT innerManagementClient;
2424

@@ -32,6 +32,7 @@ public abstract class Manager<InnerT> implements HasServiceClient<InnerT> {
3232
protected Manager(HttpPipeline httpPipeline, AzureProfile profile, InnerT innerManagementClient) {
3333
this.httpPipeline = httpPipeline;
3434
if (httpPipeline != null) {
35+
// ResourceManager sends httpPipeline=null to avoid recursive
3536
this.resourceManager = ResourceManager.authenticate(httpPipeline, profile).withDefaultSubscription();
3637
}
3738
this.subscriptionId = profile.getSubscriptionId();
@@ -65,6 +66,10 @@ public AzureEnvironment environment() {
6566
*/
6667
protected final void withResourceManager(ResourceManager resourceManager) {
6768
this.resourceManager = resourceManager;
69+
if (this.httpPipeline == null) {
70+
// fill httpPipeline from resourceManager
71+
this.httpPipeline = resourceManager.serviceClient().getHttpPipeline();
72+
}
6873
}
6974

7075
/**

sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/ManagerLiveTests.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import com.azure.resourcemanager.storage.StorageManager;
3636
import com.azure.resourcemanager.test.ResourceManagerTestBase;
3737
import com.azure.resourcemanager.trafficmanager.TrafficManager;
38+
import org.junit.jupiter.api.Assertions;
3839
import org.junit.jupiter.api.Test;
3940

4041
import java.time.temporal.ChronoUnit;
@@ -99,5 +100,8 @@ public void testAuthentication() {
99100
SqlServerManager.authenticate(httpPipeline, profile()).sqlServers().list().stream().count();
100101
StorageManager.authenticate(httpPipeline, profile()).storageAccounts().list().stream().count();
101102
TrafficManager.authenticate(httpPipeline, profile()).profiles().list().stream().count();
103+
104+
Assertions.assertNotNull(AzureResourceManager.authenticate(httpPipeline, profile()).withDefaultSubscription()
105+
.genericResources().manager().httpPipeline());
102106
}
103107
}

0 commit comments

Comments
 (0)