Author: violetagg
Date: Wed Sep 17 05:40:06 2014
New Revision: 1625466
URL: http://svn.apache.org/r1625466
Log:
Merged revisions 1605890,1605891 from tomcat/trunk:
- Fix an i18n TODO
- This time with the unsupported extension name
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/TransformationFactory.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1605890-1605891
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties?rev=1625466&r1=1625465&r2=1625466&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
Wed Sep 17 05:40:06 2014
@@ -33,6 +33,8 @@ perMessageDeflate.duplicateParameter=Dup
perMessageDeflate.invalidWindowSize=An invalid windows of [{1}] size was
specified for [{0}]. Valid values are whole numbers from 8 to 15 inclusive.
perMessageDeflate.unknownParameter=An unknown extension parameter [{0}] was
defined
+transformerFactory.unsupportedExtension=The extension [{0}] is not supported
+
util.notToken=An illegal extension parameter was specified with name [{0}] and
value [{1}]
util.invalidMessageHandler=The message handler provided does not have an
onMessage(Object) method
util.invalidType=Unable to coerce value [{0}] to type [{1}]. That type is not
supported.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/TransformationFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/TransformationFactory.java?rev=1625466&r1=1625465&r2=1625466&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/TransformationFactory.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/TransformationFactory.java
Wed Sep 17 05:40:06 2014
@@ -20,8 +20,12 @@ import java.util.List;
import javax.websocket.Extension;
+import org.apache.tomcat.util.res.StringManager;
+
public class TransformationFactory {
+ private static final StringManager sm =
StringManager.getManager(Constants.PACKAGE_NAME);
+
private static final TransformationFactory factory = new
TransformationFactory();
private TransformationFactory() {
@@ -36,7 +40,7 @@ public class TransformationFactory {
if (PerMessageDeflate.NAME.equals(name)) {
return PerMessageDeflate.negotiate(preferences);
}
- // TODO i18n
- throw new IllegalArgumentException("Unsupported extension");
+ throw new IllegalArgumentException(
+ sm.getString("transformerFactory.unsupportedExtension", name));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
