Author: violetagg
Date: Thu Jul 9 12:25:30 2015
New Revision: 1690080
URL: http://svn.apache.org/r1690080
Log:
Apply feedback provided by kkolinko
Modified:
tomcat/trunk/java/org/apache/catalina/ant/DeployTask.java
Modified: tomcat/trunk/java/org/apache/catalina/ant/DeployTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/DeployTask.java?rev=1690080&r1=1690079&r2=1690080&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/DeployTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/DeployTask.java Thu Jul 9
12:25:30 2015
@@ -198,7 +198,11 @@ public class DeployTask extends Abstract
sb.append("&tag=");
sb.append(URLEncoder.encode(tag, getCharset()));
}
+
+ execute(sb.toString(), stream, contentType, contentLength);
} catch (UnsupportedEncodingException e) {
+ throw new BuildException("Invalid 'charset' attribute: " +
getCharset());
+ } finally {
if (stream != null) {
try {
stream.close();
@@ -206,11 +210,8 @@ public class DeployTask extends Abstract
// Ignore
}
}
- throw new BuildException("Invalid 'charset' attribute: " +
getCharset());
}
- execute(sb.toString(), stream, contentType, contentLength);
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
