Skip to content

Correctly monkey-patch id also in whe os / arch is used within librar…#8913

Merged
normanmaurer merged 1 commit into4.1from
loader_fix
Mar 5, 2019
Merged

Correctly monkey-patch id also in whe os / arch is used within librar…#8913
normanmaurer merged 1 commit into4.1from
loader_fix

Conversation

@normanmaurer
Copy link
Copy Markdown
Member

…y name.

Motivation:

2bb9f64 introduced a change which made it possible to use different shaded versions of netty-tcnative on the classpath. This only partly worked as we did not correctly handled the case when os / arch is part of the library name (which is the case when netty-tcnative-boringssl-static is used with the uber jar).

Modifications:

  • If patching the ID failed we retry again with the os / arch stripped
  • Add unit tests to verify that patching ID now works with and without os / arch as suffix.

Result:

Using multiple shaded version of netty-tcnative-boringssl-static on MacOS works.

…y name.

Motivation:

2bb9f64 introduced a change which made it possible to use different shaded versions of netty-tcnative on the classpath. This only partly worked as we did not correctly handled the case when os / arch is part of the library name (which is the case when netty-tcnative-boringssl-static is used with the uber jar).

Modifications:

- If patching the ID failed we retry again with the os / arch stripped
- Add unit tests to verify that patching ID now works with and without os / arch as suffix.

Result:

Using multiple shaded version of netty-tcnative-boringssl-static on MacOS works.
@normanmaurer normanmaurer added this to the 4.1.34.Final milestone Mar 4, 2019
@normanmaurer normanmaurer self-assigned this Mar 4, 2019
Copy link
Copy Markdown
Member

@carl-mastrangelo carl-mastrangelo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@normanmaurer normanmaurer merged commit 452abd9 into 4.1 Mar 5, 2019
@normanmaurer normanmaurer deleted the loader_fix branch March 5, 2019 08:10
normanmaurer added a commit that referenced this pull request Mar 5, 2019
…y name. (#8913)

Motivation:

2bb9f64 introduced a change which made it possible to use different shaded versions of netty-tcnative on the classpath. This only partly worked as we did not correctly handled the case when os / arch is part of the library name (which is the case when netty-tcnative-boringssl-static is used with the uber jar).

Modifications:

- If patching the ID failed we retry again with the os / arch stripped
- Add unit tests to verify that patching ID now works with and without os / arch as suffix.

Result:

Using multiple shaded version of netty-tcnative-boringssl-static on MacOS works.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants