Merge pull request #29 from unloggedio/fix/issue-614-4

Fix for issue-614-4
unloggedio · Jan 11, 2024 · 8d791f4 · 8d791f4
2 parents a1a0658 + a716529
commit 8d791f4
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/main/java/io/unlogged/mocking/MockHandler.java b/src/main/java/io/unlogged/mocking/MockHandler.java
@@ -5,6 +5,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.type.TypeFactory;
+
 import io.unlogged.mocking.construction.JsonDeserializer;
 import net.bytebuddy.ByteBuddy;
 import net.bytebuddy.dynamic.DynamicType;
@@ -176,7 +177,12 @@ public Object intercept(@AllArguments Object[] methodArguments,
 //        }
 //        Method realMethod = originalImplementation.getClass()
 //                .getMethod(invokedMethod.getName(), invokedMethod.getParameterTypes());
-        return invokedMethod.invoke(originalImplementation, methodArguments);
+
+		if (originalImplementation == null){
+			return null;
+		}
+
+		return invokedMethod.invoke(originalImplementation, methodArguments);
     }
 
     private Object createReturnValueInstance(ThenParameter thenParameter, Method invokedMethod, ClassLoader classLoader, String classNameToBeConstructed, String returnValueSerialized)