Skip to content

Commit cf360fb

Browse files
authored
Fix NPE error
1 parent e62e882 commit cf360fb

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/service/components/host-merge-ruler.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,9 @@ export default class CustomizedHostMergeRuler implements IHostMergeRuler {
8181
matchResult && (merged = matchResult.result)
8282
if (merged === undefined) {
8383
// No rule matched
84-
return isIpAndPort(origin) ? origin : psl.get(origin)
84+
return isIpAndPort(origin)
85+
? origin
86+
: psl.get(origin) || this.merge0(2, origin)
8587
} else {
8688
return this.merge0(merged, origin)
8789
}
@@ -90,4 +92,4 @@ export default class CustomizedHostMergeRuler implements IHostMergeRuler {
9092
private merge0(merged: string | number, origin: string): string {
9193
return typeof merged === 'string' ? (merged === '' ? origin : merged) : getTheSuffix(origin, merged)
9294
}
93-
}
95+
}

0 commit comments

Comments
 (0)