tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject svn commit: r1184876 - /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
Date Sun, 16 Oct 2011 17:19:52 GMT
Author: rmannibucau
Date: Sun Oct 16 17:19:51 2011
New Revision: 1184876

URL: http://svn.apache.org/viewvc?rev=1184876&view=rev
Log:
ignoring dummy for global global/ bindings

Modified:
    openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java

Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1184876&r1=1184875&r2=1184876&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
(original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
Sun Oct 16 17:19:51 2011
@@ -826,13 +826,17 @@ public class Assembler extends Assembler
             // bind all global values on global context
             for (Map.Entry<String, Object> value : appContext.getBindings().entrySet())
{
                 String path = value.getKey();
-                if (!path.startsWith("global")) {
+                if (!path.startsWith("global") || path.equalsIgnoreCase("global/dummy"))
{ // dummy bound for each app
                     continue;
                 }
 
                 // a bit weird but just to be consistent if user doesn't lookup directly
the resource
                 Context lastContext = ContextUtil.mkdirs(containerSystemContext, path);
-                lastContext.bind(path.substring(path.lastIndexOf("/") + 1, path.length()),
value.getValue());
+                try {
+                    lastContext.bind(path.substring(path.lastIndexOf("/") + 1, path.length()),
value.getValue());
+                } catch (NameAlreadyBoundException nabe) {
+                    nabe.printStackTrace();
+                }
                 containerSystemContext.rebind(path, value.getValue());
             }
 



Mime
View raw message