You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by ke...@apache.org on 2010/08/03 20:14:13 UTC
svn commit: r981993 - in /openejb/branches/openejb-3.1.x/container:
openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
openejb-jee/src/main/java/org/apache/openejb/jee/SessionBean.java
Author: kevan
Date: Tue Aug 3 18:14:13 2010
New Revision: 981993
URL: http://svn.apache.org/viewvc?rev=981993&view=rev
Log:
Oh well, patch had already been merged onto trunk...
Modified:
openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
openejb/branches/openejb-3.1.x/container/openejb-jee/src/main/java/org/apache/openejb/jee/SessionBean.java
Modified: openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java?rev=981993&r1=981992&r2=981993&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java (original)
+++ openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java Tue Aug 3 18:14:13 2010
@@ -156,6 +156,7 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
import static java.util.Arrays.asList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -1327,10 +1328,12 @@ public class AnnotationDeployer implemen
* Allow for all session bean types
* @DependsOn
*/
- if (sessionBean.getDependsOn().isEmpty()) {
+ if (sessionBean.getDependsOn() == null) {
DependsOn dependsOn = getInheritableAnnotation(clazz, DependsOn.class);
if (dependsOn != null) {
sessionBean.setDependsOn(dependsOn.value());
+ } else {
+ sessionBean.setDependsOn(Collections.EMPTY_LIST);
}
}
Modified: openejb/branches/openejb-3.1.x/container/openejb-jee/src/main/java/org/apache/openejb/jee/SessionBean.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/container/openejb-jee/src/main/java/org/apache/openejb/jee/SessionBean.java?rev=981993&r1=981992&r2=981993&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/container/openejb-jee/src/main/java/org/apache/openejb/jee/SessionBean.java (original)
+++ openejb/branches/openejb-3.1.x/container/openejb-jee/src/main/java/org/apache/openejb/jee/SessionBean.java Tue Aug 3 18:14:13 2010
@@ -31,7 +31,6 @@ import javax.xml.bind.annotation.adapter
import java.util.ArrayList;
import java.util.List;
import java.util.Collection;
-import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Arrays;
@@ -214,7 +213,7 @@ public class SessionBean implements Remo
@XmlElementWrapper(name = "depends-on")
@XmlElement(name = "ejb-name")
- protected List<String> dependsOn = Collections.emptyList();
+ protected List<String> dependsOn;
@XmlAttribute
@XmlJavaTypeAdapter(CollapsedStringAdapter.class)