fix: only call %Extends if class defined

isc-tleavitt · isc-tleavitt · commit d4923f0fb82b · 2024-07-03T12:51:58.000-04:00
diff --git a/cls/SourceControl/Git/Util/ProductionConflictResolver.cls b/cls/SourceControl/Git/Util/ProductionConflictResolver.cls
@@ -65,7 +65,7 @@ Method ConsumeStream() [ Private ]
         $$$ThrowStatus($$$ERROR($$$GeneralError,"File with conflict is not a class."))
     }
     Set ..productionClassname = $Piece(internalName,".",1,*-1)
-    If '$$$comClassDefined(..productionClassname) && '$ClassMethod(..productionClassname,"%Extends","Ens.Production") {
+    If '($$$comClassDefined(..productionClassname) && $ClassMethod(..productionClassname,"%Extends","Ens.Production")) {
         $$$ThrowStatus($$$ERROR($$$GeneralError,"File with conflict is not an interoperability production."))
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ Method ConsumeStream() [ Private ]`
`65`	`65`	`$$$ThrowStatus($$$ERROR($$$GeneralError,"File with conflict is not a class."))`
`66`	`66`	`}`
`67`	`67`	`Set ..productionClassname = $Piece(internalName,".",1,*-1)`
`68`		`- If '$$$comClassDefined(..productionClassname) && '$ClassMethod(..productionClassname,"%Extends","Ens.Production") {`
	`68`	`+ If '($$$comClassDefined(..productionClassname) && $ClassMethod(..productionClassname,"%Extends","Ens.Production")) {`
`69`	`69`	`$$$ThrowStatus($$$ERROR($$$GeneralError,"File with conflict is not an interoperability production."))`
`70`	`70`	`}`
`71`	`71`	`}`