pull/4259/head
Phillip Webb 9 years ago
parent c2a46b8e3b
commit 15fbb8ddf9

@ -83,8 +83,8 @@ public class JerseyAutoConfiguration implements WebApplicationInitializer {
this.path = parseApplicationPath(this.jersey.getApplicationPath());
}
else {
this.path = findApplicationPath(AnnotationUtils.findAnnotation(this.config.getClass(),
ApplicationPath.class));
this.path = findApplicationPath(AnnotationUtils
.findAnnotation(this.config.getClass(), ApplicationPath.class));
}
}

@ -44,8 +44,8 @@ public class JerseyProperties {
private Filter filter = new Filter();
/**
* Path that serves as the base URI for the application. Overrides
* the value of "@ApplicationPath" if specified.
* Path that serves as the base URI for the application. Overrides the value of
* "@ApplicationPath" if specified.
*/
private String applicationPath;

@ -313,7 +313,8 @@ public class RelaxedDataBinder extends DataBinder {
return false;
}
if (Properties.class.isAssignableFrom(descriptor.getObjectType())) {
// Properties is declared as Map<Object,Object> but we know it's really Map<String,String>
// Properties is declared as Map<Object,Object> but we know it's really
// Map<String,String>
return true;
}
Class<?> valueType = descriptor.getMapValueTypeDescriptor().getObjectType();

Loading…
Cancel
Save