[FAB-2195] Fix infinite loop in mspconf

Jason Yellick · Jason Yellick · commit d625402cd6ec · 2017-02-11T14:44:08.000-05:00
https://jira.hyperledger.org/browse/FAB-2195 Refactoring the MSP config handler code it made sense to embed the MSP manager into the config handler structure. This results in an infinite loop which this CR addresses. Change-Id: I78e7d9e5079e954f4ed891a659bb0c3c94d620d7 Signed-off-by: Jason Yellick <jyellick@us.ibm.com>
diff --git a/common/configtx/handlers/msp/config.go b/common/configtx/handlers/msp/config.go
@@ -73,8 +73,3 @@ func (bh *MSPConfigHandler) ProposeConfig(configItem *common.ConfigItem) error {
 	bh.proposedMgr = msp.NewMSPManager()
 	return bh.proposedMgr.Setup(bh.config)
 }
-
-// DesierializeIdentity allows *MSPConfigHandler to implement the msp.Common interface
-func (bh *MSPConfigHandler) DeserializeIdentity(serializedIdentity []byte) (msp.Identity, error) {
-	return bh.DeserializeIdentity(serializedIdentity)
-}

Original file line number	Diff line number	Diff line change
`@@ -73,8 +73,3 @@ func (bh MSPConfigHandler) ProposeConfig(configItem common.ConfigItem) error {`
`73`	`73`	`bh.proposedMgr = msp.NewMSPManager()`
`74`	`74`	`return bh.proposedMgr.Setup(bh.config)`
`75`	`75`	`}`
`76`		`-`
`77`		`-// DesierializeIdentity allows *MSPConfigHandler to implement the msp.Common interface`
`78`		`-func (bh *MSPConfigHandler) DeserializeIdentity(serializedIdentity []byte) (msp.Identity, error) {`
`79`		`- return bh.DeserializeIdentity(serializedIdentity)`
`80`		`-}`