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/22 10:48:56 UTC
tomee git commit: if altdd is filled from ear#META-INF then p.xml can
be a simple URL
Repository: tomee
Updated Branches:
refs/heads/master 1f2586fad -> 961371dd1
if altdd is filled from ear#META-INF then p.xml can be a simple URL
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/961371dd
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/961371dd
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/961371dd
Branch: refs/heads/master
Commit: 961371dd1c0ee4386177395d5e797aad04952c15
Parents: 1f2586f
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Fri May 22 10:48:45 2015 +0200
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Fri May 22 10:48:45 2015 +0200
----------------------------------------------------------------------
.../java/org/apache/openejb/config/DeploymentLoader.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/961371dd/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java b/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
index 58ba02e..e88b0b2 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
@@ -90,6 +90,8 @@ import java.util.jar.JarFile;
import java.util.jar.Manifest;
import java.util.zip.ZipEntry;
+import static java.util.Arrays.asList;
+
/**
* @version $Revision$ $Date$
*/
@@ -827,9 +829,11 @@ public class DeploymentLoader implements DeploymentFilterable {
}
{
- List<URL> persistenceXmls = (List<URL>) appModule.getAltDDs().get("persistence.xml");
+ final Object pXml = appModule.getAltDDs().get("persistence.xml");
+
+ List<URL> persistenceXmls = List.class.isInstance(pXml) ? (List<URL>) pXml : new ArrayList<>(asList(URL.class.cast(pXml)));
if (persistenceXmls == null) {
- persistenceXmls = new ArrayList<URL>();
+ persistenceXmls = new ArrayList<>();
appModule.getAltDDs().put("persistence.xml", persistenceXmls);
}