Author: rmannibucau
Date: Thu Nov 17 11:24:33 2011
New Revision: 1203155
URL: http://svn.apache.org/viewvc?rev=1203155&view=rev
Log:
avoiding NPE when a custom mdb container uses badly defined activation
properties
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java?rev=1203155&r1=1203154&r2=1203155&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
Thu Nov 17 11:24:33 2011
@@ -827,7 +827,13 @@ public class AnnotationDeployer implemen
private String
getConfigPropertyType(javax.resource.spi.ConfigProperty annotation, Class<?>
type) {
Class<?> t = (annotation == null) ? null :
annotation.type();
- if (t == null || t.equals(Object.class)) {
+ if (t == null && type != null) {
+ return type.getName();
+ } else if (t == null) {
+ return null;
+ }
+
+ if (t.equals(Object.class)) {
t = type;
}
if (t == null) { // t == null && type == null
