[maven-shade-plugin] branch master updated: [MSHADE-412] avoid possible NPE since rawString was added in SimpleRelocator (#123)

[rmannibucau]

This is an automated email from the ASF dual-hosted git repository.

rmannibucau pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git


The following commit(s) were added to refs/heads/master by this push:
     new 17b87aa  [MSHADE-412] avoid possible NPE since rawString was added in 
SimpleRelocator (#123)
17b87aa is described below

commit 17b87aa368db6e0bcea4f6c2f1e07e46945f2f4b
Author: Romain Manni-Bucau <rmannibu...@gmail.com>
AuthorDate: Thu Mar 17 13:40:30 2022 +0100

    [MSHADE-412] avoid possible NPE since rawString was added in 
SimpleRelocator (#123)
---
 .../org/apache/maven/plugins/shade/relocation/SimpleRelocator.java  | 2 +-
 .../apache/maven/plugins/shade/relocation/SimpleRelocatorTest.java  | 6 ++++++
 2 files changed, 7 insertions(+), 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
index 3837a67..df51ea2 100644
--- 
a/src/main/java/org/apache/maven/plugins/shade/relocation/SimpleRelocator.java
+++ 
b/src/main/java/org/apache/maven/plugins/shade/relocation/SimpleRelocator.java
@@ -242,7 +242,7 @@ public class SimpleRelocator
 
     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
index e85972a..699d1b3 100644
--- 
a/src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorTest.java
+++ 
b/src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorTest.java
@@ -39,6 +39,12 @@ public class SimpleRelocatorTest
 {
 
     @Test
+    public void testNoNpeRelocateClass()
+    {
+        new SimpleRelocator( "foo", "bar", null, null, true ).relocateClass( 
"foo" );
+    }
+
+    @Test
     public void testCanRelocatePath()
     {
         SimpleRelocator relocator;