Skip to content

Commit d9b165d

Browse files
committed
Make request nullable because in the unit/integration tests it might not be available
1 parent ce9748e commit d9b165d

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

slice-mapper/src/main/java/com/cognifide/slice/mapper/impl/processor/RequestAttributeProcessor.java

+7-2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
*/
2020
package com.cognifide.slice.mapper.impl.processor;
2121

22+
import com.cognifide.slice.api.qualifier.Nullable;
2223
import com.cognifide.slice.mapper.annotation.RequestAttribute;
2324
import com.cognifide.slice.mapper.api.processor.FieldProcessor;
2425
import com.google.inject.Inject;
@@ -32,6 +33,7 @@
3233
public class RequestAttributeProcessor implements FieldProcessor {
3334

3435
@Inject
36+
@Nullable
3537
private ServletRequest servletRequest;
3638

3739
@Override
@@ -41,8 +43,11 @@ public boolean accepts(final Resource resource, final Field field) {
4143

4244
@Override
4345
public Object mapResourceToField(Resource resource, ValueMap valueMap, Field field, String propertyName) {
44-
String attributeName = getAttributeName(field);
45-
return servletRequest.getAttribute(attributeName);
46+
if (servletRequest != null) {
47+
String attributeName = getAttributeName(field);
48+
return servletRequest.getAttribute(attributeName);
49+
}
50+
return null;
4651
}
4752

4853
private String getAttributeName(Field field) {

0 commit comments

Comments
 (0)