MSHADE-412 avoid possible NPE since rawString was added in SimpleRelo…

…cator
apache · Mar 17, 2022 · 81a374b · 81a374b
1 parent 0070183
commit 81a374b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/main/java/org/apache/maven/plugins/shade/relocation/SimpleRelocator.java b/src/main/java/org/apache/maven/plugins/shade/relocation/SimpleRelocator.java
@@ -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 )

diff --git a/src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorTest.java b/src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorTest.java
@@ -38,6 +38,12 @@
 public class SimpleRelocatorTest
 {
 
+    @Test
+    public void testNoNpeRelocateClass()
+    {
+        new SimpleRelocator( "foo", "bar", null, null, true ).relocateClass( "foo" );
+    }
+
     @Test
     public void testCanRelocatePath()
     {