This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new bf5e555 Revert changes that broke compilation with source=1.6
bf5e555 is described below
commit bf5e5555c18b33646e22225e232c8b873d55bd54
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Sun Jun 30 23:10:21 2019 +0100
Revert changes that broke compilation with source=1.6
---
.../apache/tomcat/websocket/pojo/PojoMessageHandlerBase.java | 4 +++-
.../tomcat/websocket/pojo/PojoMessageHandlerPartialBase.java | 4 +++-
.../tomcat/websocket/pojo/PojoMessageHandlerWholeBase.java | 4 +++-
.../tomcat/websocket/pojo/PojoMessageHandlerWholeBinary.java | 2 +-
.../tomcat/websocket/pojo/PojoMessageHandlerWholeText.java | 2 +-
java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java | 10 +++++-----
6 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBase.java
b/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBase.java
index bc125c7..f50d8af 100644
--- a/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBase.java
+++ b/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBase.java
@@ -83,8 +83,10 @@ public abstract class PojoMessageHandlerBase<T>
} else {
remoteEndpoint.sendObject(result);
}
- } catch (IOException | EncodeException ioe) {
+ } catch (IOException ioe) {
throw new IllegalStateException(ioe);
+ } catch (EncodeException e) {
+ throw new IllegalStateException(e);
}
}
diff --git
a/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialBase.java
b/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialBase.java
index 4a0f525..7a7261f 100644
--- a/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialBase.java
+++ b/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialBase.java
@@ -69,7 +69,9 @@ public abstract class PojoMessageHandlerPartialBase<T>
Object result = null;
try {
result = method.invoke(pojo, parameters);
- } catch (IllegalAccessException | InvocationTargetException e) {
+ } catch (IllegalAccessException e) {
+ handlePojoMethodException(e);
+ } catch (InvocationTargetException e) {
handlePojoMethodException(e);
}
processResult(result);
diff --git
a/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBase.java
b/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBase.java
index aa4abbe..b864c64 100644
--- a/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBase.java
+++ b/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBase.java
@@ -78,7 +78,9 @@ public abstract class PojoMessageHandlerWholeBase<T>
Object result = null;
try {
result = method.invoke(pojo, parameters);
- } catch (IllegalAccessException | InvocationTargetException e) {
+ } catch (IllegalAccessException e) {
+ handlePojoMethodException(e);
+ } catch (InvocationTargetException e) {
handlePojoMethodException(e);
}
processResult(result);
diff --git
a/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBinary.java
b/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBinary.java
index e4756f6..4162832 100644
--- a/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBinary.java
+++ b/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBinary.java
@@ -41,7 +41,7 @@ public class PojoMessageHandlerWholeBinary
private static final StringManager sm =
StringManager.getManager(PojoMessageHandlerWholeBinary.class);
- private final List<Decoder> decoders = new ArrayList<>();
+ private final List<Decoder> decoders = new ArrayList<Decoder>();
private final boolean isForInputStream;
diff --git
a/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeText.java
b/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeText.java
index 3ec4bd7..2deef64 100644
--- a/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeText.java
+++ b/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeText.java
@@ -42,7 +42,7 @@ public class PojoMessageHandlerWholeText
private static final StringManager sm =
StringManager.getManager(PojoMessageHandlerWholeText.class);
- private final List<Decoder> decoders = new ArrayList<>();
+ private final List<Decoder> decoders = new ArrayList<Decoder>();
private final Class<?> primitiveType;
public PojoMessageHandlerWholeText(Object pojo, Method method,
diff --git a/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
b/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
index d640b53..02f65ac 100644
--- a/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
+++ b/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
@@ -66,7 +66,7 @@ public class PojoMethodMapping {
private final PojoPathParam[] onOpenParams;
private final PojoPathParam[] onCloseParams;
private final PojoPathParam[] onErrorParams;
- private final List<MessageHandlerInfo> onMessage = new ArrayList<>();
+ private final List<MessageHandlerInfo> onMessage = new
ArrayList<MessageHandlerInfo>();
private final String wsPath;
@@ -176,7 +176,7 @@ public class PojoMethodMapping {
error = null;
}
}
- List<MessageHandlerInfo> overriddenOnMessage = new ArrayList<>();
+ List<MessageHandlerInfo> overriddenOnMessage = new
ArrayList<MessageHandlerInfo>();
for (MessageHandlerInfo messageHandler : onMessage) {
if (messageHandler.m.getDeclaringClass() != clazzPojo
&& isOverridenWithoutAnnotation(clazzPojoMethods,
messageHandler.m, OnMessage.class)) {
@@ -271,7 +271,7 @@ public class PojoMethodMapping {
public Set<MessageHandler> getMessageHandlers(Object pojo,
Map<String,String> pathParameters, Session session,
EndpointConfig config) {
- Set<MessageHandler> result = new HashSet<>();
+ Set<MessageHandler> result = new HashSet<MessageHandler>();
for (MessageHandlerInfo messageMethod : onMessage) {
result.addAll(messageMethod.getMessageHandlers(pojo,
pathParameters,
session, config));
@@ -373,7 +373,7 @@ public class PojoMethodMapping {
private int indexInputStream = -1;
private int indexReader = -1;
private int indexPrimitive = -1;
- private Map<Integer,PojoPathParam> indexPathParams = new HashMap<>();
+ private Map<Integer,PojoPathParam> indexPathParams = new
HashMap<Integer,PojoPathParam>();
private int indexPayload = -1;
private DecoderMatch decoderMatch = null;
private long maxMessageSize = -1;
@@ -644,7 +644,7 @@ public class PojoMethodMapping {
params[entry.getKey().intValue()] = value;
}
- Set<MessageHandler> results = new HashSet<>(2);
+ Set<MessageHandler> results = new HashSet<MessageHandler>(2);
if (indexBoolean == -1) {
// Basic
if (indexString != -1 || indexPrimitive != -1) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
