Fix the NullPointerException on using the convertTo in Converter

erafaelmanuel · erafaelmanuel · commit 30318c5e45c0 · 2018-01-25T23:03:51.000+08:00
diff --git a/core/src/main/java/io/ermdev/mapfierj/Converter.java b/core/src/main/java/io/ermdev/mapfierj/Converter.java
@@ -97,7 +97,7 @@ public <T> T convertTo(final Object o, Class<T> type) throws MappingException {
                                             .get();
 
                                     objects.setObject(adapter.convert(o));
-                                    if (!objects.getObject().getClass().equals(type)) {
+                                    if (objects.getObject() == null || !objects.getObject().getClass().equals(type)) {
                                         throw new TypeException("Type not match");
                                     }
                                     return true;
@@ -111,7 +111,8 @@ public <T> T convertTo(final Object o, Class<T> type) throws MappingException {
                                                     "with no arguments");
                                         }
                                         objects.setObject(adapter.convert(o));
-                                        if (!objects.getObject().getClass().equals(type)) {
+                                        if (objects.getObject() == null || !objects
+                                                .getObject().getClass().equals(type)) {
                                             throw new TypeException("Type not match");
                                         }
                                         return true;

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public <T> T convertTo(final Object o, Class<T> type) throws MappingException {`
`97`	`97`	`.get();`
`98`	`98`
`99`	`99`	`objects.setObject(adapter.convert(o));`
`100`		`- if (!objects.getObject().getClass().equals(type)) {`
	`100`	`+ if (objects.getObject() == null \|\| !objects.getObject().getClass().equals(type)) {`
`101`	`101`	`throw new TypeException("Type not match");`
`102`	`102`	`}`
`103`	`103`	`return true;`
`@@ -111,7 +111,8 @@ public <T> T convertTo(final Object o, Class<T> type) throws MappingException {`
`111`	`111`	`"with no arguments");`
`112`	`112`	`}`
`113`	`113`	`objects.setObject(adapter.convert(o));`
`114`		`- if (!objects.getObject().getClass().equals(type)) {`
	`114`	`+ if (objects.getObject() == null \|\| !objects`
	`115`	`+ .getObject().getClass().equals(type)) {`
`115`	`116`	`throw new TypeException("Type not match");`
`116`	`117`	`}`
`117`	`118`	`return true;`