Merge pull request #1229 from bonitasoft/fix/1225-NPE-wildfly

thboileau · web-flow · commit 0ce99aef9c8a · 2016-11-05T14:46:34.000+01:00
fix(1225) avoid NPE on forwarded request in wildfly
diff --git a/modules/org.restlet.ext.servlet/src/org/restlet/ext/servlet/internal/ServletServerAdapter.java b/modules/org.restlet.ext.servlet/src/org/restlet/ext/servlet/internal/ServletServerAdapter.java
@@ -85,8 +85,10 @@ public HttpRequest toRequest(ServerCall httpCall) {
             for (final Enumeration<String> namesEnum = servletCall.getRequest()
                     .getAttributeNames(); namesEnum.hasMoreElements();) {
                 attributeName = namesEnum.nextElement();
-                result.getAttributes().put(attributeName,
-                        servletCall.getRequest().getAttribute(attributeName));
+                Object attribute = servletCall.getRequest().getAttribute(attributeName);
+                if (attribute != null) {
+                    result.getAttributes().put(attributeName, attribute);
+                }
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -85,8 +85,10 @@ public HttpRequest toRequest(ServerCall httpCall) {`
`85`	`85`	`for (final Enumeration<String> namesEnum = servletCall.getRequest()`
`86`	`86`	`.getAttributeNames(); namesEnum.hasMoreElements();) {`
`87`	`87`	`attributeName = namesEnum.nextElement();`
`88`		`- result.getAttributes().put(attributeName,`
`89`		`- servletCall.getRequest().getAttribute(attributeName));`
	`88`	`+ Object attribute = servletCall.getRequest().getAttribute(attributeName);`
	`89`	`+ if (attribute != null) {`
	`90`	`+ result.getAttributes().put(attributeName, attribute);`
	`91`	`+ }`
`90`	`92`	`}`
`91`	`93`	`}`
`92`	`94`