Author: remm
Date: Wed Dec 12 10:27:30 2018
New Revision: 1848739
URL: http://svn.apache.org/viewvc?rev=1848739&view=rev
Log:
Add i18n for other packages
Added:
tomcat/trunk/java/org/apache/naming/factory/webservices/LocalStrings.properties
(with props)
tomcat/trunk/java/org/apache/tomcat/util/json/LocalStrings.properties
(with props)
Modified:
tomcat/trunk/java/org/apache/el/Messages.properties
tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java
tomcat/trunk/java/org/apache/el/lang/FunctionMapperFactory.java
tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java
tomcat/trunk/java/org/apache/el/lang/VariableMapperFactory.java
tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java
tomcat/trunk/java/org/apache/el/parser/AstLambdaExpression.java
tomcat/trunk/java/org/apache/naming/factory/DataSourceLinkFactory.java
tomcat/trunk/java/org/apache/naming/factory/LocalStrings.properties
tomcat/trunk/java/org/apache/naming/factory/ResourceFactory.java
tomcat/trunk/java/org/apache/naming/factory/ResourceLinkFactory.java
tomcat/trunk/java/org/apache/naming/factory/webservices/ServiceProxy.java
tomcat/trunk/java/org/apache/tomcat/util/json/JSONParser.jj
tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplClient.java
Modified: tomcat/trunk/java/org/apache/el/Messages.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/Messages.properties?rev=1848739&r1=1848738&r2=1848739&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/Messages.properties [UTF-8] (original)
+++ tomcat/trunk/java/org/apache/el/Messages.properties [UTF-8] Wed Dec 12
10:27:30 2018
@@ -14,9 +14,15 @@
# limitations under the License.
# General Errors
+error.cannotSetVariables=Cannot set variables on factory
error.convert=Cannot convert [{0}] of type [{1}] to [{2}]
error.compare=Cannot compare [{0}] to [{1}]
error.function=Problems calling function [{0}]
+error.invalidMethodExpression=Not a valid method expression [{0}]
+error.noFunctionMapperTarget=FunctionMapper target cannot be null
+error.noVariableMapperTarget=FunctionMapper target cannot be null
+error.nullLocalName=Local name cannot be null
+error.nullMethod=Method cannot be null
error.unreachable.base=Target Unreachable, identifier [{0}] resolved to null
error.unreachable.property=Target Unreachable, [{0}] returned null
error.resolver.unhandled=ELResolver did not handle type: [{0}] with property
of [{1}]
@@ -54,8 +60,11 @@ error.context.null=ELContext was null
# Parser
error.funciton.tooManyMethodParameterSets=There are multiple sets of
parameters specified for function [{0}]
+error.identifier.noMethod=Identity [{0}] was null and was unable to invoke
error.identifier.notjava=The identifier [{0}] is not a valid Java identifier
as required by section 1.19 of the EL specification (Identifier ::= Java
language identifier). This check can be disabled by setting the system property
org.apache.el.parser.SKIP_IDENTIFIER_CHECK to true.
+error.identifier.notMethodExpression=Identity [{0}] does not reference a
method expression instance, returned type [{1}]
error.lambda.tooManyMethodParameterSets=There are more sets of method
parameters specified than there are nested lambda expressions
+error.lambda.wrongNestedState=Nested state may only be set once
# Stream
stream.compare.notComparable=Stream elements must implement Comparable
Modified: tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java?rev=1848739&r1=1848738&r2=1848739&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java Wed Dec 12
10:27:30 2018
@@ -258,8 +258,7 @@ public final class ExpressionBuilder imp
return new MethodExpressionLiteral(expression, expectedReturnType,
expectedParamTypes);
} else {
- throw new ELException("Not a Valid Method Expression: "
- + expression);
+ throw new
ELException(MessageFactory.get("error.invalidMethodExpression", expression));
}
}
Modified: tomcat/trunk/java/org/apache/el/lang/FunctionMapperFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/FunctionMapperFactory.java?rev=1848739&r1=1848738&r2=1848739&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/lang/FunctionMapperFactory.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/FunctionMapperFactory.java Wed Dec 12
10:27:30 2018
@@ -21,6 +21,8 @@ import java.lang.reflect.Method;
import javax.el.FunctionMapper;
+import org.apache.el.util.MessageFactory;
+
/**
* @author Jacob Hookom [ja...@hookom.net]
*/
@@ -31,7 +33,7 @@ public class FunctionMapperFactory exten
public FunctionMapperFactory(FunctionMapper mapper) {
if (mapper == null) {
- throw new NullPointerException("FunctionMapper target cannot be
null");
+ throw new
NullPointerException(MessageFactory.get("error.noFunctionMapperTarget"));
}
this.target = mapper;
}
Modified: tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java?rev=1848739&r1=1848738&r2=1848739&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java Wed Dec 12
10:27:30 2018
@@ -26,6 +26,7 @@ import java.util.concurrent.ConcurrentMa
import javax.el.FunctionMapper;
+import org.apache.el.util.MessageFactory;
import org.apache.el.util.ReflectionUtil;
@@ -98,10 +99,10 @@ public class FunctionMapperImpl extends
public Function(String prefix, String localName, Method m) {
if (localName == null) {
- throw new NullPointerException("LocalName cannot be null");
+ throw new
NullPointerException(MessageFactory.get("error.nullLocalName"));
}
if (m == null) {
- throw new NullPointerException("Method cannot be null");
+ throw new
NullPointerException(MessageFactory.get("error.nullMethod"));
}
this.prefix = prefix;
this.localName = localName;
Modified: tomcat/trunk/java/org/apache/el/lang/VariableMapperFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/VariableMapperFactory.java?rev=1848739&r1=1848738&r2=1848739&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/lang/VariableMapperFactory.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/VariableMapperFactory.java Wed Dec 12
10:27:30 2018
@@ -20,6 +20,8 @@ package org.apache.el.lang;
import javax.el.ValueExpression;
import javax.el.VariableMapper;
+import org.apache.el.util.MessageFactory;
+
public class VariableMapperFactory extends VariableMapper {
private final VariableMapper target;
@@ -27,7 +29,7 @@ public class VariableMapperFactory exten
public VariableMapperFactory(VariableMapper target) {
if (target == null) {
- throw new NullPointerException("Target VariableMapper cannot be
null");
+ throw new
NullPointerException(MessageFactory.get("error.noVariableMapperTarget"));
}
this.target = target;
}
@@ -50,6 +52,6 @@ public class VariableMapperFactory exten
@Override
public ValueExpression setVariable(String variable, ValueExpression
expression) {
- throw new UnsupportedOperationException("Cannot Set Variables on
Factory");
+ throw new
UnsupportedOperationException(MessageFactory.get("error.cannotSetVariables"));
}
}
Modified: tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java?rev=1848739&r1=1848738&r2=1848739&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java Wed Dec 12
10:27:30 2018
@@ -225,14 +225,9 @@ public final class AstIdentifier extends
if (obj instanceof MethodExpression) {
return (MethodExpression) obj;
} else if (obj == null) {
- throw new MethodNotFoundException("Identity '" + this.image
- + "' was null and was unable to invoke");
+ throw new
MethodNotFoundException(MessageFactory.get("error.identifier.noMethod",
this.image));
} else {
- throw new ELException(
- "Identity '"
- + this.image
- + "' does not reference a MethodExpression
instance, returned type: "
- + obj.getClass().getName());
+ throw new
ELException(MessageFactory.get("error.identifier.notMethodExpression",
this.image, obj.getClass().getName()));
}
}
}
Modified: tomcat/trunk/java/org/apache/el/parser/AstLambdaExpression.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstLambdaExpression.java?rev=1848739&r1=1848738&r2=1848739&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstLambdaExpression.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstLambdaExpression.java Wed Dec 12
10:27:30 2018
@@ -120,7 +120,7 @@ public class AstLambdaExpression extends
private void setNestedState(NestedState nestedState) {
if (this.nestedState != null) {
// Should never happen
- throw new IllegalStateException("nestedState may only be set
once");
+ throw new
IllegalStateException(MessageFactory.get("error.lambda.wrongNestedState"));
}
this.nestedState = nestedState;
Modified: tomcat/trunk/java/org/apache/naming/factory/DataSourceLinkFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/DataSourceLinkFactory.java?rev=1848739&r1=1848738&r2=1848739&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/factory/DataSourceLinkFactory.java
(original)
+++ tomcat/trunk/java/org/apache/naming/factory/DataSourceLinkFactory.java Wed
Dec 12 10:27:30 2018
@@ -137,7 +137,7 @@ public class DataSourceLinkFactory exten
if (iface == DataSource.class) {
return ds;
} else {
- throw new SQLException("Not a wrapper of "+iface.getName());
+ throw new
SQLException(sm.getString("dataSourceLinkFactory.badWrapper", iface.getName()));
}
}
Modified: tomcat/trunk/java/org/apache/naming/factory/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/LocalStrings.properties?rev=1848739&r1=1848738&r2=1848739&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/factory/LocalStrings.properties [UTF-8]
(original)
+++ tomcat/trunk/java/org/apache/naming/factory/LocalStrings.properties [UTF-8]
Wed Dec 12 10:27:30 2018
@@ -13,11 +13,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+dataSourceLinkFactory.badWrapper=Not a wrapper for type [{0}]
+
lookupFactory.circularReference=Found a circular reference involving [{0}]
lookupFactory.createFailed=Could not create instance of JNDI lookup factory
class
lookupFactory.loadFailed=Could not load JNDI lookup factory class
lookupFactory.typeMismatch=The JNDI reference [{0}] was expected to be of type
[{1}] but the lookup [{2}] return an object of type [{3}]
+resourceFactory.factoryCreationError=Could not create resource factory instance
+
+resourceLinkFactory.invalidGlobalContext=Caller provided invalid global context
resourceLinkFactory.nullType=The local resource link [{0}] that refers to
global resource [{1}] does not specify the required attribute type
resourceLinkFactory.unknownType=The local resource link [{0}] that refers to
global resource [{1}] specified the unknown type [{2}]
resourceLinkFactory.wrongType=The local resource link [{0}] that refers to
global resource [{1}] was expected to return an instance of [{2}] but returned
an instance of [{3}]
Modified: tomcat/trunk/java/org/apache/naming/factory/ResourceFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/ResourceFactory.java?rev=1848739&r1=1848738&r2=1848739&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/factory/ResourceFactory.java (original)
+++ tomcat/trunk/java/org/apache/naming/factory/ResourceFactory.java Wed Dec 12
10:27:30 2018
@@ -21,6 +21,7 @@ import javax.naming.Reference;
import javax.naming.spi.ObjectFactory;
import org.apache.naming.ResourceRef;
+import org.apache.naming.StringManager;
/**
* Object factory for Resources.
@@ -29,6 +30,8 @@ import org.apache.naming.ResourceRef;
*/
public class ResourceFactory extends FactoryBase {
+ private static final StringManager sm =
StringManager.getManager(ResourceLinkFactory.class);
+
@Override
protected boolean isReferenceTypeSupported(Object obj) {
return obj instanceof ResourceRef;
@@ -47,8 +50,7 @@ public class ResourceFactory extends Fac
factory = (ObjectFactory) Class.forName(
javaxSqlDataSourceFactoryClassName).getConstructor().newInstance();
} catch (Exception e) {
- NamingException ex = new NamingException(
- "Could not create resource factory instance");
+ NamingException ex = new
NamingException(sm.getString("resourceFactory.factoryCreationError"));
ex.initCause(e);
throw ex;
}
@@ -69,8 +71,7 @@ public class ResourceFactory extends Fac
if (t instanceof VirtualMachineError) {
throw (VirtualMachineError) t;
}
- NamingException ex = new NamingException(
- "Could not create resource factory instance");
+ NamingException ex = new
NamingException(sm.getString("resourceFactory.factoryCreationError"));
ex.initCause(t);
throw ex;
}
Modified: tomcat/trunk/java/org/apache/naming/factory/ResourceLinkFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/ResourceLinkFactory.java?rev=1848739&r1=1848738&r2=1848739&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/factory/ResourceLinkFactory.java
(original)
+++ tomcat/trunk/java/org/apache/naming/factory/ResourceLinkFactory.java Wed
Dec 12 10:27:30 2018
@@ -40,7 +40,7 @@ public class ResourceLinkFactory impleme
// ------------------------------------------------------- Static Variables
- private static final StringManager sm =
StringManager.getManager(ResourceLinkFactory.class);
+ protected static final StringManager sm =
StringManager.getManager(ResourceLinkFactory.class);
/**
* Global naming context.
@@ -102,7 +102,7 @@ public class ResourceLinkFactory impleme
private static void validateGlobalContext(Context globalContext) {
if (ResourceLinkFactory.globalContext != null &&
ResourceLinkFactory.globalContext != globalContext) {
- throw new SecurityException("Caller provided invalid global
context");
+ throw new
SecurityException(sm.getString("resourceLinkFactory.invalidGlobalContext"));
}
}
Added:
tomcat/trunk/java/org/apache/naming/factory/webservices/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/webservices/LocalStrings.properties?rev=1848739&view=auto
==============================================================================
---
tomcat/trunk/java/org/apache/naming/factory/webservices/LocalStrings.properties
(added)
+++
tomcat/trunk/java/org/apache/naming/factory/webservices/LocalStrings.properties
Wed Dec 12 10:27:30 2018
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+serviceProxy.portNotFound=Port-component-ref [{0}] not found
Propchange:
tomcat/trunk/java/org/apache/naming/factory/webservices/LocalStrings.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
tomcat/trunk/java/org/apache/naming/factory/webservices/ServiceProxy.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/webservices/ServiceProxy.java?rev=1848739&r1=1848738&r2=1848739&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/factory/webservices/ServiceProxy.java
(original)
+++ tomcat/trunk/java/org/apache/naming/factory/webservices/ServiceProxy.java
Wed Dec 12 10:27:30 2018
@@ -27,6 +27,8 @@ import javax.xml.namespace.QName;
import javax.xml.rpc.Service;
import javax.xml.rpc.ServiceException;
+import org.apache.naming.StringManager;
+
/**
* Object proxy for Web Services.
*
@@ -34,6 +36,8 @@ import javax.xml.rpc.ServiceException;
*/
public class ServiceProxy implements InvocationHandler {
+ private static final StringManager sm =
StringManager.getManager(ServiceProxy.class);
+
/**
* Service object.
* used for delegation
Modified: tomcat/trunk/java/org/apache/tomcat/util/json/JSONParser.jj
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/json/JSONParser.jj?rev=1848739&r1=1848738&r2=1848739&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/json/JSONParser.jj (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/json/JSONParser.jj Wed Dec 12
10:27:30 2018
@@ -58,6 +58,8 @@ package org.apache.tomcat.util.json;
@SuppressWarnings("all") // Ignore warnings in generated code
public class JSONParser {
+ protected static final org.apache.tomcat.util.res.StringManager sm =
org.apache.tomcat.util.res.StringManager.getManager(JSONParser.class);
+
private boolean nativeNumbers = false;
public JSONParser(String input) {
@@ -70,7 +72,7 @@ public class JSONParser {
public java.util.LinkedHashMap<String, Object> parseObject() throws
ParseException {
java.util.LinkedHashMap<String, Object> toReturn = object();
if (!ensureEOF()) {
- throw new IllegalStateException("Expected EOF, but still had
content to parse");
+ throw new
IllegalStateException(sm.getString("parser.unexpectedEOF"));
}
return toReturn;
}
@@ -81,7 +83,7 @@ public class JSONParser {
public java.util.ArrayList<Object> parseArray() throws ParseException {
java.util.ArrayList<Object> toReturn = list();
if (!ensureEOF()) {
- throw new IllegalStateException("Expected EOF, but still had
content to parse");
+ throw new
IllegalStateException(sm.getString("parser.unexpectedEOF"));
}
return toReturn;
}
@@ -92,7 +94,7 @@ public class JSONParser {
public Object parse() throws ParseException {
Object toReturn = anything();
if (!ensureEOF()) {
- throw new IllegalStateException("Expected EOF, but still had
content to parse");
+ throw new
IllegalStateException(sm.getString("parser.unexpectedEOF"));
}
return toReturn;
}
Added: tomcat/trunk/java/org/apache/tomcat/util/json/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/json/LocalStrings.properties?rev=1848739&view=auto
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/json/LocalStrings.properties
(added)
+++ tomcat/trunk/java/org/apache/tomcat/util/json/LocalStrings.properties Wed
Dec 12 10:27:30 2018
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+parser.unexpectedEOF=Expected EOF, but still had content to parse
Propchange:
tomcat/trunk/java/org/apache/tomcat/util/json/LocalStrings.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties?rev=1848739&r1=1848738&r2=1848739&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
[UTF-8] Wed Dec 12 10:27:30 2018
@@ -38,6 +38,7 @@ futureToSendHandler.timeout=Operation ti
perMessageDeflate.deflateFailed=Failed to decompress a compressed WebSocket
frame
perMessageDeflate.duplicateParameter=Duplicate definition of the [{0}]
extension parameter
+perMessageDeflate.invalidState=Invalid state
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
@@ -93,6 +94,7 @@ wsRemoteEndpoint.nullData=Invalid null d
wsRemoteEndpoint.nullHandler=Invalid null handler argument
wsRemoteEndpoint.sendInterrupt=The current thread was interrupted while
waiting for a blocking send to complete
wsRemoteEndpoint.tooMuchData=Ping or pong may not send more than 125 bytes
+wsRemoteEndpoint.writeTimeout=Blocking write timeout
wsRemoteEndpoint.wrongState=The remote endpoint was in state [{0}] which is an
invalid state for called method
# Note the following message is used as a close reason in a WebSocket control
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java?rev=1848739&r1=1848738&r2=1848739&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java Wed
Dec 12 10:27:30 2018
@@ -421,7 +421,7 @@ public class PerMessageDeflate implement
blockingWriteTimeoutExpiry);
}
} else {
- throw new IllegalStateException("Should never happen");
+ throw new
IllegalStateException(sm.getString("perMessageDeflate.invalidState"));
}
// Add the newly created compressed part to the set of
parts
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java?rev=1848739&r1=1848738&r2=1848739&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
Wed Dec 12 10:27:30 2018
@@ -50,7 +50,7 @@ import org.apache.tomcat.util.res.String
public abstract class WsRemoteEndpointImplBase implements RemoteEndpoint {
- private static final StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(WsRemoteEndpointImplBase.class);
protected static final SendResult SENDRESULT_OK = new SendResult();
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplClient.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplClient.java?rev=1848739&r1=1848738&r2=1848739&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplClient.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplClient.java
Wed Dec 12 10:27:30 2018
@@ -53,7 +53,7 @@ public class WsRemoteEndpointImplClient
} else {
timeout = blockingWriteTimeoutExpiry -
System.currentTimeMillis();
if (timeout < 0) {
- SendResult sr = new SendResult(new IOException("Blocking
write timeout"));
+ SendResult sr = new SendResult(new
IOException(sm.getString("wsRemoteEndpoint.writeTimeout")));
handler.onResult(sr);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
