Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MSHADE-412] avoid possible NPE since rawString was added in SimpleRelocator #123

Merged
merged 1 commit into from
Mar 17, 2022
Merged

[MSHADE-412] avoid possible NPE since rawString was added in SimpleRelocator #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/org/apache/maven/plugins/shade/relocation/SimpleRelocator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ public String relocatePath( String path )

public String relocateClass( String clazz )
{
return clazz.replaceFirst( pattern, shadedPattern );
return rawString ? clazz : clazz.replaceFirst( pattern, shadedPattern );
}

public String applyToSourceContent( String sourceContent )
Expand Down
6 changes: 6 additions & 0 deletions src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,12 @@
public class SimpleRelocatorTest
{

@Test
public void testNoNpeRelocateClass()
{
new SimpleRelocator( "foo", "bar", null, null, true ).relocateClass( "foo" );
}

@Test
public void testCanRelocatePath()
{
Expand Down