Author: markt
Date: Tue Jun 30 13:13:43 2015
New Revision: 1688445
URL: http://svn.apache.org/r1688445
Log:
Fix some i18n TODOs
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1688445&r1=1688444&r2=1688445&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Tue Jun
30 13:13:43 2015
@@ -186,8 +186,8 @@ public class Http2UpgradeHandler extends
remoteSettings.set(id, value);
}
} catch (Http2Exception | IOException ioe) {
- // TODO i18n
- throw new ProtocolException();
+ throw new ProtocolException(
+ sm.getString("upgradeHandler.upgrade.fail",
connectionId));
}
}
@@ -204,8 +204,8 @@ public class Http2UpgradeHandler extends
try {
parser.readConnectionPreface();
} catch (Http2Exception e) {
- // TODO i18n
- throw new ProtocolException();
+ throw new ProtocolException(
+ sm.getString("upgradeHandler.invalidPreface",
connectionId));
}
if (webConnection != null) {
Modified: tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties?rev=1688445&r1=1688444&r2=1688445&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties Tue Jun
30 13:13:43 2015
@@ -78,6 +78,7 @@ upgradeHandler.allocate.recipient=Connec
upgradeHandler.rst.debug=Connection [{0}], Stream [{1}], Error [{2}], RST
(closing stream)
upgradeHandler.goaway.debug=Connection [{0}], Goaway, Last stream [{1}], Error
code [{2}], Debug data [{3}]
upgradeHandler.init=Connection [{0}]
+upgradeHandler.invalidPreface=Connection [{0}], Invalid connection preface
upgradeHandler.ioerror=Connection [{0}]
upgradeHandler.pause.entry=Connection [{0}] Pausing
upgradeHandler.sendPrefaceFail=Failed to send preface to client
@@ -89,6 +90,7 @@ upgradeHandler.tooManyRemoteStreams=The
upgradeHandler.unexpectedEos=Unexpected end of stream
upgradeHandler.unexpectedStatus=An unexpected value of status ([{0}]) was
passed to this method
upgradeHandler.upgrade=Connection [{0}], HTTP/1.1 upgrade to stream [1]
+upgradeHandler.upgrade.fail=Connection [{0}], HTTP/1.1 upgrade failed
upgradeHandler.upgradeDispatch.entry=Entry, Connection [{0}], SocketStatus
[{1}]
upgradeHandler.upgradeDispatch.exit=Exit, Connection [{0}], SocketState [{1}]
upgradeHandler.writeBody=Connection [{0}], Stream [{1}], Data length [{2}]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
