Thanks Andy!
> On 11 Sep 2014, at 11:20, [email protected] wrote: > > Author: andygumbrecht > Date: Thu Sep 11 10:20:10 2014 > New Revision: 1624253 > > URL: http://svn.apache.org/r1624253 > Log: > Merged Jon's changes > > Added: > > tomee/tomee/branches/tomee-1.7.1/container/openejb-core/src/test/java/org/apache/openejb/config/OutputGeneratedDescriptorsTest.java > - copied unchanged from r1624250, > tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/OutputGeneratedDescriptorsTest.java > tomee/tomee/branches/tomee-1.7.1/server/openejb-hsql/src/test/ > - copied from r1624250, > tomee/tomee/branches/tomee-1.7.x/server/openejb-hsql/src/test/ > Modified: > tomee/tomee/branches/tomee-1.7.1/ (props changed) > > tomee/tomee/branches/tomee-1.7.1/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/SessionBean$JAXB.java > > tomee/tomee/branches/tomee-1.7.1/server/openejb-client/src/main/java/org/apache/openejb/client/EJBObjectHandler.java > > tomee/tomee/branches/tomee-1.7.1/server/openejb-hsql/src/main/java/org/apache/openejb/server/hsql/HsqlService.java > > Propchange: tomee/tomee/branches/tomee-1.7.1/ > ------------------------------------------------------------------------------ > Merged /tomee/tomee/branches/tomee-1.7.x:r1624008-1624250 > > Modified: > tomee/tomee/branches/tomee-1.7.1/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/SessionBean$JAXB.java > URL: > http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.1/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/SessionBean%24JAXB.java?rev=1624253&r1=1624252&r2=1624253&view=diff > ============================================================================== > --- > tomee/tomee/branches/tomee-1.7.1/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/SessionBean$JAXB.java > (original) > +++ > tomee/tomee/branches/tomee-1.7.1/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/SessionBean$JAXB.java > Thu Sep 11 10:20:10 2014 > @@ -25,9 +25,12 @@ import org.metatype.sxc.util.XoXMLStream > import javax.xml.XMLConstants; > import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; > import javax.xml.namespace.QName; > + > import java.util.ArrayList; > +import java.util.HashSet; > import java.util.LinkedHashSet; > import java.util.List; > +import java.util.Set; > > import static org.apache.openejb.jee.AroundInvoke$JAXB.readAroundInvoke; > import static org.apache.openejb.jee.AroundInvoke$JAXB.writeAroundInvoke; > @@ -91,7 +94,19 @@ import static org.apache.openejb.jee.Tra > }) > public class SessionBean$JAXB > extends JAXBObject<SessionBean> { > + > + private static final Set<String> sessionBeanClasses; > > + static { > + sessionBeanClasses = new HashSet<String>(); > + sessionBeanClasses.add("org.apache.openejb.jee.SessionBean"); > + sessionBeanClasses.add("org.apache.openejb.jee.ManagedBean"); > + sessionBeanClasses.add("org.apache.openejb.config.CompManagedBean"); > + sessionBeanClasses.add("org.apache.openejb.jee.StatefulBean"); > + sessionBeanClasses.add("org.apache.openejb.jee.StatelessBean"); > + sessionBeanClasses.add("org.apache.openejb.jee.SingletonBean"); > + > + } > > public SessionBean$JAXB() { > super(SessionBean.class, null, new > QName("http://java.sun.com/xml/ns/javaee".intern(), > "session-beanType".intern()), Text$JAXB.class, Icon$JAXB.class, > Empty$JAXB.class, SessionType$JAXB.class, Timeout$JAXB.class, > NamedMethod$JAXB.class, Timer$JAXB.class, > ConcurrencyManagementType$JAXB.class, ConcurrentMethod$JAXB.class, > InitMethod$JAXB.class, RemoveMethod$JAXB.class, AsyncMethod$JAXB.class, > TransactionType$JAXB.class, AroundInvoke$JAXB.class, > AroundTimeout$JAXB.class, EnvEntry$JAXB.class, EjbRef$JAXB.class, > EjbLocalRef$JAXB.class, ServiceRef$JAXB.class, ResourceRef$JAXB.class, > ResourceEnvRef$JAXB.class, MessageDestinationRef$JAXB.class, > PersistenceContextRef$JAXB.class, PersistenceUnitRef$JAXB.class, > LifecycleCallback$JAXB.class, DataSource$JAXB.class, > SecurityRoleRef$JAXB.class, SecurityIdentity$JAXB.class); > @@ -828,7 +843,8 @@ public class SessionBean$JAXB > } > > final String prefix = > writer.getUniquePrefix("http://java.sun.com/xml/ns/javaee";); > - if (SessionBean.class != sessionBean.getClass()) { > + > + if (! sessionBeanClasses.contains(sessionBean.getClass().getName())) > { > context.unexpectedSubclass(writer, sessionBean, > SessionBean.class); > return; > } > > Modified: > tomee/tomee/branches/tomee-1.7.1/server/openejb-client/src/main/java/org/apache/openejb/client/EJBObjectHandler.java > URL: > http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.1/server/openejb-client/src/main/java/org/apache/openejb/client/EJBObjectHandler.java?rev=1624253&r1=1624252&r2=1624253&view=diff > ============================================================================== > --- > tomee/tomee/branches/tomee-1.7.1/server/openejb-client/src/main/java/org/apache/openejb/client/EJBObjectHandler.java > (original) > +++ > tomee/tomee/branches/tomee-1.7.1/server/openejb-client/src/main/java/org/apache/openejb/client/EJBObjectHandler.java > Thu Sep 11 10:20:10 2014 > @@ -323,15 +323,15 @@ public abstract class EJBObjectHandler e > > private class AsynchronousCall implements Callable { > > - private Method method; > + private final Method method; > > - private Object[] args; > + private final Object[] args; > > - private Object proxy; > + private final Object proxy; > > - private String requestId; > + private final String requestId; > > - private EJBResponse response; > + private final EJBResponse response; > > public AsynchronousCall(final Method method, final Object[] args, > final Object proxy, final String requestId, final EJBResponse response) { > this.method = method; > @@ -355,15 +355,15 @@ public abstract class EJBObjectHandler e > > private class FutureAdapter<T> implements Future<T> { > > - private Future<T> target; > + private final Future<T> target; > > - private String requestId; > + private final String requestId; > > - private EJBResponse response; > + private final EJBResponse response; > > private volatile boolean canceled; > > - private AtomicBoolean lastMayInterruptIfRunningValue = new > AtomicBoolean(false); > + private final AtomicBoolean lastMayInterruptIfRunningValue = new > AtomicBoolean(false); > > public FutureAdapter(final Future<T> target, final EJBResponse > response, final String requestId) { > this.target = target; > @@ -452,10 +452,7 @@ public abstract class EJBObjectHandler e > > @Override > public boolean isDone() { > - if (canceled) { > - return false; > - } > - return target.isDone(); > + return !canceled && target.isDone(); > } > } > } > \ No newline at end of file > > Modified: > tomee/tomee/branches/tomee-1.7.1/server/openejb-hsql/src/main/java/org/apache/openejb/server/hsql/HsqlService.java > URL: > http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.1/server/openejb-hsql/src/main/java/org/apache/openejb/server/hsql/HsqlService.java?rev=1624253&r1=1624252&r2=1624253&view=diff > ============================================================================== > --- > tomee/tomee/branches/tomee-1.7.1/server/openejb-hsql/src/main/java/org/apache/openejb/server/hsql/HsqlService.java > (original) > +++ > tomee/tomee/branches/tomee-1.7.1/server/openejb-hsql/src/main/java/org/apache/openejb/server/hsql/HsqlService.java > Thu Sep 11 10:20:10 2014 > @@ -35,6 +35,7 @@ import javax.naming.Binding; > import javax.naming.NameNotFoundException; > import javax.naming.NamingEnumeration; > import javax.sql.DataSource; > + > import java.io.IOException; > import java.io.InputStream; > import java.io.OutputStream; > @@ -60,6 +61,7 @@ public class HsqlService implements Serv > private static final java.lang.String sc_key_address = "server.address"; > private static final java.lang.String sc_key_database = "server.database"; > private static final java.lang.String sc_key_no_system_exit = > "server.no_system_exit"; > + private static final String DRIVER_NAME = > HsqlDatabaseProperties.PRODUCT_NAME + " Driver"; > > private int port = > ServerConfiguration.getDefaultPort(ServerConstants.SC_PROTOCOL_HSQL, false); > private String ip = ServerConstants.SC_DEFAULT_ADDRESS; > @@ -179,7 +181,7 @@ public class HsqlService implements Serv > > private String getPath(final String driver, final String url) { > // is this connectoion using the hsql driver? > - if (!HsqlDatabaseProperties.PRODUCT_NAME.equals(driver)) { > + if ((!HsqlDatabaseProperties.PRODUCT_NAME.equals(driver)) && > (!DRIVER_NAME.equals(driver))) { > return null; > } > > >
