Commit a73d393

committed

Merge branch 'fix-npe-platform-json' into master

2 parents 2b4883f + 7c089c9 commit a73d393Copy full SHA for a73d393

File tree

+19

-1

lines changed

+19

-1

lines changed

Lines changed: 19 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,24 @@ public boolean equals(Object obj) {`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`ContributedPlatform obj1 = (ContributedPlatform) obj;`
`111`		`- return getParentPackage().getName().equals(obj1.getParentPackage().getName()) && getArchitecture().equals(obj1.getArchitecture()) && getVersion().equals(obj1.getVersion()) && getName().equals(obj1.getName());`
	`111`	`+`
	`112`	`+ ContributedPackage parentPackage = getParentPackage();`
	`113`	`+ ContributedPackage parentPackage1 = obj1.getParentPackage();`
	`114`	`+ if (parentPackage == null) {`
	`115`	`+ if (parentPackage1 != null)`
	`116`	`+ return false;`
	`117`	`+ } else {`
	`118`	`+ if (parentPackage1 == null)`
	`119`	`+ return false;`
	`120`	`+ if (!parentPackage.getName().equals(parentPackage1.getName()))`
	`121`	`+ return false;`
	`122`	`+ }`
	`123`	`+ if (!getArchitecture().equals(obj1.getArchitecture())) {`
	`124`	`+ return false;`
	`125`	`+ }`
	`126`	`+ if (!getVersion().equals(obj1.getVersion())) {`
	`127`	`+ return false;`
	`128`	`+ }`
	`129`	`+ return getName().equals(obj1.getName());`
`112`	`130`	`}`
`113`	`131`	`}`

Comments

(0)