Merge pull request #2501 from cloudfoundry-incubator/fix-leak

Provide Create Service Instance its own CfOrgSpaceDataService instance
cloudfoundry · Jun 22, 2018 · 2e2ddb0 · 2e2ddb0
2 parents fb11e43 + b5bcd59
commit 2e2ddb0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/...ed/components/add-service-instance/add-service-instance/add-service-instance.component.ts b/...ed/components/add-service-instance/add-service-instance/add-service-instance.component.ts
@@ -50,7 +50,8 @@ import { CsiModeService } from '../csi-mode.service';
     CreateServiceInstanceHelperServiceFactory,
     TitleCasePipe,
     CsiGuidsService,
-    CsiModeService
+    CsiModeService,
+    CfOrgSpaceDataService
   ]
 })
 export class AddServiceInstanceComponent implements OnDestroy, AfterContentInit {

diff --git a/...app/shared/components/add-service-instance/select-plan-step/select-plan-step.component.ts b/...app/shared/components/add-service-instance/select-plan-step/select-plan-step.component.ts
@@ -72,8 +72,6 @@ export class SelectPlanStepComponent implements OnDestroy {
 
   servicePlans: ServicePlan[];
 
-  servicePlanVisibilitySub: Subscription;
-  changeSubscription: Subscription;
   validate = new BehaviorSubject<boolean>(false);
   subscription: Subscription;
   stepperForm: FormGroup;
@@ -170,8 +168,6 @@ export class SelectPlanStepComponent implements OnDestroy {
 
   ngOnDestroy(): void {
     safeUnsubscribe(this.subscription);
-    safeUnsubscribe(this.changeSubscription);
-    safeUnsubscribe(this.servicePlanVisibilitySub);
   }
 
   getPlanAccessibility = (servicePlan: APIResource<IServicePlan>): Observable<CardStatus> => {