Fixed potential NPE.

thboileau · thboileau · commit 5b2519ae3dc5 · 2017-10-24T11:20:42.000+02:00
diff --git a/modules/org.restlet/src/org/restlet/service/ConverterService.java b/modules/org.restlet/src/org/restlet/service/ConverterService.java
@@ -310,7 +310,7 @@ public Representation toRepresentation(Object source, Variant target)
     public Representation toRepresentation(Object source, Variant target,
             Resource resource) throws IOException {
         Representation result = null;
-        boolean loggable = (resource == null) ? true : resource.isLoggable();
+        boolean loggable = (resource == null) || resource.isLoggable();
         ConverterHelper ch = ConverterUtils.getBestHelper(source, target,
                 resource);
 
@@ -334,10 +334,11 @@ public Representation toRepresentation(Object source, Variant target,
                     } else {
                         target = variants.get(0);
                     }
-                } else {
-                    target = new Variant();
                 }
             }
+            if (target == null) {
+                target = new Variant();
+            }
 
             result = ch.toRepresentation(source, target, resource);
 

Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,7 @@ public Representation toRepresentation(Object source, Variant target)`
`310`	`310`	`public Representation toRepresentation(Object source, Variant target,`
`311`	`311`	`Resource resource) throws IOException {`
`312`	`312`	`Representation result = null;`
`313`		`- boolean loggable = (resource == null) ? true : resource.isLoggable();`
	`313`	`+ boolean loggable = (resource == null) \|\| resource.isLoggable();`
`314`	`314`	`ConverterHelper ch = ConverterUtils.getBestHelper(source, target,`
`315`	`315`	`resource);`
`316`	`316`
`@@ -334,10 +334,11 @@ public Representation toRepresentation(Object source, Variant target,`
`334`	`334`	`} else {`
`335`	`335`	`target = variants.get(0);`
`336`	`336`	`}`
`337`		`- } else {`
`338`		`- target = new Variant();`
`339`	`337`	`}`
`340`	`338`	`}`
	`339`	`+ if (target == null) {`
	`340`	`+ target = new Variant();`
	`341`	`+ }`
`341`	`342`
`342`	`343`	`result = ch.toRepresentation(source, target, resource);`
`343`	`344`