Issue 173 (#174)

* fix maven configuration (test resources) * Fix NPe in tests - Closes #173
EsotericSoftware · Nov 27, 2023 · 9ca85f8 · 9ca85f8
1 parent 8f35506
commit 9ca85f8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/pom.xml b/pom.xml
@@ -52,6 +52,14 @@
 		<sourceDirectory>src</sourceDirectory>
 		<testSourceDirectory>test</testSourceDirectory>
 		<outputDirectory>target/classes</outputDirectory>
+<testResources>
+	<testResource>
+		<directory>test</directory>
+		<includes>
+			<include>**/*.yml</include>
+		</includes>
+	</testResource>
+</testResources>
 		<plugins>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>

diff --git a/src/com/esotericsoftware/yamlbeans/YamlReader.java b/src/com/esotericsoftware/yamlbeans/YamlReader.java
@@ -190,7 +190,7 @@ private Class<?> chooseType (String tag, Class<?> defaultType, Class<?> provided
 			try {
 				Class<?> loadedFromTag = findTagClass(tag, classLoader);
 				if (loadedFromTag != null) {
-					if (!providedType.isAssignableFrom(loadedFromTag)) {
+					if (providedType != null && !providedType.isAssignableFrom(loadedFromTag)) {
 						throw new YamlReaderException("Class specified by tag is incompatible with expected type: "
 							+ loadedFromTag.getName() + " (expected " + providedType.getName() + ")");
 					}