diff options
| author | Emmanuel Bourg <ebourg@apache.org> | 2019-03-09 14:46:25 +0000 |
|---|---|---|
| committer | Andrej Shadura <andrewsh@debian.org> | 2019-03-09 14:46:25 +0000 |
| commit | d454878205a0c17afdd58b50768f8964aedd7050 (patch) | |
| tree | c4acb6ec1a90bb9f3ef54a55371c7ba4185030d4 /spring-webmvc/src/main/java/org | |
| parent | c132c3122ce8cae81dd7a011706bb3d1448371f0 (diff) | |
Fix the compatibility with the version of velocity-tools in Debian
Forwarded: no
Gbp-Pq: Name 0034-velocity-tools-compatibility.patch
Diffstat (limited to 'spring-webmvc/src/main/java/org')
| -rw-r--r-- | spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityToolboxView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityToolboxView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityToolboxView.java index 8513f9d5..7200bee6 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityToolboxView.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityToolboxView.java @@ -110,7 +110,7 @@ public class VelocityToolboxView extends VelocityView { if (getToolboxConfigLocation() != null) { ToolboxManager toolboxManager = ServletToolboxManager.getInstance( getServletContext(), getToolboxConfigLocation()); - Map<?, ?> toolboxContext = toolboxManager.getToolbox(velocityContext); + Map toolboxContext = toolboxManager.getToolbox(velocityContext); velocityContext.setToolbox(toolboxContext); } |