From 9801afb85d9cbbc76bd222e7e577460dd7806919 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@pivotal.io>
Date: Thu, 15 Feb 2018 15:59:21 -0500
Subject: [PATCH] Fix compile error

Update places that call UriUtils to catch the right exception that is
now raised as a result of using Charet.forName.
---
 .../java/org/springframework/web/servlet/tags/UrlTag.java | 8 ++++----
 .../springframework/web/servlet/tags/form/FormTag.java    | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java
index e3d23d7222..43afa94b27 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java
@@ -17,7 +17,7 @@
 package org.springframework.web.servlet.tags;
 
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.UnsupportedCharsetException;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -334,7 +334,7 @@ public class UrlTag extends HtmlEscapingAwareTag implements ParamAware {
 						qs.append(UriUtils.encodeQueryParam(param.getValue(), encoding));
 					}
 				}
-				catch (UnsupportedEncodingException ex) {
+				catch (UnsupportedCharsetException ex) {
 					throw new JspException(ex);
 				}
 			}
@@ -363,7 +363,7 @@ public class UrlTag extends HtmlEscapingAwareTag implements ParamAware {
 				try {
 					uri = uri.replace(template, (value != null ? UriUtils.encodePath(value, encoding) : ""));
 				}
-				catch (UnsupportedEncodingException ex) {
+				catch (UnsupportedCharsetException ex) {
 					throw new JspException(ex);
 				}
 			}
@@ -376,7 +376,7 @@ public class UrlTag extends HtmlEscapingAwareTag implements ParamAware {
 						uri = uri.replace(template,
 								(value != null ? UriUtils.encodePathSegment(param.getValue(), encoding) : ""));
 					}
-					catch (UnsupportedEncodingException ex) {
+					catch (UnsupportedCharsetException ex) {
 						throw new JspException(ex);
 					}
 				}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/FormTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/FormTag.java
index 673c101389..7782f35eac 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/FormTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/FormTag.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.servlet.tags.form;
 
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.UnsupportedCharsetException;
 import java.util.Map;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
@@ -625,7 +625,7 @@ public class FormTag extends AbstractHtmlElementTag {
 			try {
 				requestUri = UriUtils.encodePath(requestUri, encoding);
 			}
-			catch (UnsupportedEncodingException ex) {
+			catch (UnsupportedCharsetException ex) {
 				// shouldn't happen - if it does, proceed with requestUri as-is
 			}
 			ServletResponse response = this.pageContext.getResponse();