You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2015/05/21 18:05:29 UTC
tomee git commit: TOMEE-1590 backport WsFactory List/collection fix
Repository: tomee
Updated Branches:
refs/heads/tomee-1.7.x 2c3aa6a3e -> d98d834af
TOMEE-1590 backport WsFactory List/collection fix
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/d98d834a
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/d98d834a
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/d98d834a
Branch: refs/heads/tomee-1.7.x
Commit: d98d834af3abe1c10145caf2f3ec60e7eb1ece81
Parents: 2c3aa6a
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Thu May 21 18:05:20 2015 +0200
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Thu May 21 18:05:20 2015 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/tomee/common/WsFactory.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/d98d834a/tomee/tomee-common/src/main/java/org/apache/tomee/common/WsFactory.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-common/src/main/java/org/apache/tomee/common/WsFactory.java b/tomee/tomee-common/src/main/java/org/apache/tomee/common/WsFactory.java
index 5e657cb..5558161 100644
--- a/tomee/tomee-common/src/main/java/org/apache/tomee/common/WsFactory.java
+++ b/tomee/tomee-common/src/main/java/org/apache/tomee/common/WsFactory.java
@@ -30,6 +30,7 @@ import javax.naming.Reference;
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
import java.net.URL;
+import java.util.Collection;
import java.util.Collections;
import java.util.Hashtable;
import java.util.List;
@@ -99,7 +100,7 @@ public class WsFactory extends AbstractObjectFactory {
if (handlerChains == null) {
handlerChains = Collections.emptyList();
}
- List<Injection> injections = NamingUtil.getStaticValue(ref, "injections");
+ Collection<Injection> injections = NamingUtil.getStaticValue(ref, "injections");
if (injections == null) {
injections = Collections.emptyList();
}