tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r982486 - in /openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee: DataSource.java MessageDestinationRef.java
Date Thu, 05 Aug 2010 07:11:45 GMT
Author: djencks
Date: Thu Aug  5 07:11:45 2010
New Revision: 982486

URL: http://svn.apache.org/viewvc?rev=982486&view=rev
Log:
missed a couple jndi key normalizations

Modified:
    openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/DataSource.java
    openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/MessageDestinationRef.java

Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/DataSource.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/DataSource.java?rev=982486&r1=982485&r2=982486&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/DataSource.java
(original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/DataSource.java
Thu Aug  5 07:11:45 2010
@@ -289,6 +289,8 @@ public class DataSource implements Keyab
 
     @Override
     public String getKey() {
-        return name;
+        String name = getName();
+        if (name == null || name.startsWith("java:")) return name;
+        return "java:comp/env/" + name;
     }
 }

Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/MessageDestinationRef.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/MessageDestinationRef.java?rev=982486&r1=982485&r2=982486&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/MessageDestinationRef.java
(original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/MessageDestinationRef.java
Thu Aug  5 07:11:45 2010
@@ -98,7 +98,9 @@ public class MessageDestinationRef imple
     }
 
     public String getKey() {
-        return getName();
+        String name = getName();
+        if (name == null || name.startsWith("java:")) return name;
+        return "java:comp/env/" + name;
     }
 
     @XmlTransient



Mime
View raw message