You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2014/07/17 09:53:05 UTC
svn commit: r1611274 [10/15] - in /tomee/tomee/branches/tomee-1.7.x/server:
./ openejb-activemq/
openejb-activemq/src/main/java/org/apache/openejb/server/activemq/
openejb-axis/ openejb-axis/src/main/java/org/apache/openejb/server/axis/
openejb-axis/sr...
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java Thu Jul 17 07:52:58 2014
@@ -83,7 +83,7 @@ public class EjbDaemon implements org.ap
try {
this.timeout = Integer.parseInt(props.getProperty("timeout", "14400000"));
- } catch (Exception e) {
+ } catch (final Exception e) {
//Ignore
}
@@ -134,13 +134,13 @@ public class EjbDaemon implements org.ap
try {
out.flush();
- } catch (Throwable e) {
+ } catch (final Throwable e) {
//Ignore
}
try {
out.close();
- } catch (Throwable e) {
+ } catch (final Throwable e) {
//Ignore
}
}
@@ -148,7 +148,7 @@ public class EjbDaemon implements org.ap
if (null != in) {
try {
in.close();
- } catch (Throwable e) {
+ } catch (final Throwable e) {
//Ignore
}
}
@@ -156,7 +156,7 @@ public class EjbDaemon implements org.ap
if (null != socket) {
try {
socket.close();
- } catch (Throwable t) {
+ } catch (final Throwable t) {
//Ignore
}
}
@@ -214,7 +214,7 @@ public class EjbDaemon implements org.ap
clusterResponse.setMetaData(clientProtocol);
clusterResponse.writeExternal(oos);
oos.flush();
- } catch (IOException ie) {
+ } catch (final IOException ie) {
final String m = "Failed to write to ClusterResponse: " + ie.getMessage();
clusterHandler.getLogger().error(m, ie);
throw Exceptions.newIOException(m, ie);
@@ -280,21 +280,21 @@ public class EjbDaemon implements org.ap
}
}
- } catch (IllegalArgumentException iae) {
+ } catch (final IllegalArgumentException iae) {
final String msg = "\"" + clientProtocol.getSpec() + "\" FAIL \"Unknown request type " + requestTypeByte;
if (logger.isDebugEnabled()) {
logger.debug(msg, iae);
} else {
logger.warning(msg + " - Debug for StackTrace");
}
- } catch (SecurityException e) {
+ } catch (final SecurityException e) {
final String msg = "\"" + requestType + " " + clientProtocol.getSpec() + "\" FAIL \"Security error - " + e.getMessage() + "\"";
if (logger.isDebugEnabled()) {
logger.debug(msg, e);
} else {
logger.warning(msg + " - Debug for StackTrace");
}
- } catch (Throwable e) {
+ } catch (final Throwable e) {
final String msg = "\"" + requestType + " " + clientProtocol.getSpec() + "\" FAIL \"Unexpected error - " + e.getMessage() + "\"";
if (logger.isDebugEnabled()) {
logger.debug(msg, e);
@@ -309,13 +309,13 @@ public class EjbDaemon implements org.ap
try {
oos.flush();
- } catch (Throwable e) {
+ } catch (final Throwable e) {
//Ignore
}
try {
oos.close();
- } catch (Throwable e) {
+ } catch (final Throwable e) {
//Ignore
}
}
@@ -323,7 +323,7 @@ public class EjbDaemon implements org.ap
if (null != ois) {
try {
ois.close();
- } catch (Throwable e) {
+ } catch (final Throwable e) {
//Ignore
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbRequestHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbRequestHandler.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbRequestHandler.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbRequestHandler.java Thu Jul 17 07:52:58 2014
@@ -96,7 +96,7 @@ class EjbRequestHandler extends RequestH
try {
req.readExternal(in);
- } catch (Throwable t) {
+ } catch (final Throwable t) {
return setResponseError(res, version, t, "Bad request");
}
@@ -110,7 +110,7 @@ class EjbRequestHandler extends RequestH
if (clientIdentity != null) {//noinspection unchecked
securityService.associate(clientIdentity);
}
- } catch (LoginException t) {
+ } catch (final LoginException t) {
failed = true;
return setResponseError(res, version, t, "Client identity is not valid - " + req);
}
@@ -119,10 +119,10 @@ class EjbRequestHandler extends RequestH
try {
di = this.daemon.getDeployment(req);
- } catch (RemoteException e) {
+ } catch (final RemoteException e) {
failed = true;
return setResponseError(res, version, e, "No such deployment");
- } catch (Throwable t) {
+ } catch (final Throwable t) {
failed = true;
return setResponseError(res, version, t, "Unkown error occured while retrieving deployment: " + req);
}
@@ -141,7 +141,7 @@ class EjbRequestHandler extends RequestH
version = req.getVersion();
res.stop(EJBResponse.Time.DESERIALIZATION);
- } catch (Throwable t) {
+ } catch (final Throwable t) {
failed = true;
return setResponseError(res, version, t, "Error caught during request body deserialization: " + req);
}
@@ -150,7 +150,7 @@ class EjbRequestHandler extends RequestH
call = CallContext.getCallContext();
call.setEJBRequest(req);
call.setBeanContext(di);
- } catch (Throwable t) {
+ } catch (final Throwable t) {
failed = true;
return setResponseError(res, version, t, "Unable to set the thread call context for this request: " + req);
}
@@ -252,14 +252,14 @@ class EjbRequestHandler extends RequestH
}
}
- } catch (org.apache.openejb.InvalidateReferenceException e) {
+ } catch (final org.apache.openejb.InvalidateReferenceException e) {
res.setResponse(version, ResponseCodes.EJB_SYS_EXCEPTION, new ThrowableArtifact(e.getRootCause()));
- } catch (org.apache.openejb.ApplicationException e) {
+ } catch (final org.apache.openejb.ApplicationException e) {
res.setResponse(version, ResponseCodes.EJB_APP_EXCEPTION, new ThrowableArtifact(e.getRootCause()));
- } catch (org.apache.openejb.SystemException e) {
+ } catch (final org.apache.openejb.SystemException e) {
res.setResponse(version, ResponseCodes.EJB_ERROR, new ThrowableArtifact(e.getRootCause()));
logger.error("System error in container for request: " + req, e);
- } catch (Throwable t) {
+ } catch (final Throwable t) {
return setResponseError(res, version, t, "Unknown error in container");
@@ -275,7 +275,7 @@ class EjbRequestHandler extends RequestH
try {
res.stop(EJBResponse.Time.CONTAINER);
- } catch (Throwable e) {
+ } catch (final Throwable e) {
//Ignore
}
@@ -283,7 +283,7 @@ class EjbRequestHandler extends RequestH
//The req and res toString overrides are volatile
try {
logger.debug("EJB REQUEST: " + req + " -- RESPONSE: " + res);
- } catch (Throwable t) {
+ } catch (final Throwable t) {
//Ignore
}
}
@@ -301,7 +301,7 @@ class EjbRequestHandler extends RequestH
try {
res.setMetaData(metaData);
res.writeExternal(out);
- } catch (Throwable t) {
+ } catch (final Throwable t) {
if (logger.isDebugEnabled()) {
logger.debug("Failed to write EjbResponse", t);
} else if (logger.isInfoEnabled()) {
@@ -310,7 +310,7 @@ class EjbRequestHandler extends RequestH
} finally {
try {
SystemInstance.get().getComponent(SecurityService.class).disassociate();
- } catch (Throwable t) {
+ } catch (final Throwable t) {
logger.warning("Failed to disassociate security", t);
}
@@ -368,12 +368,12 @@ class EjbRequestHandler extends RequestH
}
Object result = c.invoke(
- req.getDeploymentId(),
- InterfaceType.EJB_OBJECT,
- req.getInterfaceClass(),
- req.getMethodInstance(),
- req.getMethodParameters(),
- req.getPrimaryKey());
+ req.getDeploymentId(),
+ InterfaceType.EJB_OBJECT,
+ req.getInterfaceClass(),
+ req.getMethodInstance(),
+ req.getMethodParameters(),
+ req.getPrimaryKey());
//Pass the internal value to the remote client, as AsyncResult is not serializable
if (result != null && asynchronous) {
@@ -401,13 +401,13 @@ class EjbRequestHandler extends RequestH
final RpcContainer c = (RpcContainer) call.getBeanContext().getContainer();
final Object result = c.invoke(
- req.getDeploymentId(),
- InterfaceType.EJB_HOME,
- req.getInterfaceClass(),
- req.getMethodInstance(),
- req.getMethodParameters(),
- req.getPrimaryKey()
- );
+ req.getDeploymentId(),
+ InterfaceType.EJB_HOME,
+ req.getInterfaceClass(),
+ req.getMethodInstance(),
+ req.getMethodParameters(),
+ req.getPrimaryKey()
+ );
res.setResponse(req.getVersion(), ResponseCodes.EJB_OK, result);
}
@@ -418,13 +418,13 @@ class EjbRequestHandler extends RequestH
final RpcContainer c = (RpcContainer) call.getBeanContext().getContainer();
Object result = c.invoke(
- req.getDeploymentId(),
- InterfaceType.EJB_HOME,
- req.getInterfaceClass(),
- req.getMethodInstance(),
- req.getMethodParameters(),
- req.getPrimaryKey()
- );
+ req.getDeploymentId(),
+ InterfaceType.EJB_HOME,
+ req.getInterfaceClass(),
+ req.getMethodInstance(),
+ req.getMethodParameters(),
+ req.getPrimaryKey()
+ );
if (result instanceof ProxyInfo) {
final ProxyInfo info = (ProxyInfo) result;
@@ -443,13 +443,13 @@ class EjbRequestHandler extends RequestH
final RpcContainer c = (RpcContainer) call.getBeanContext().getContainer();
Object result = c.invoke(
- req.getDeploymentId(),
- InterfaceType.EJB_HOME,
- req.getInterfaceClass(),
- req.getMethodInstance(),
- req.getMethodParameters(),
- req.getPrimaryKey()
- );
+ req.getDeploymentId(),
+ InterfaceType.EJB_HOME,
+ req.getInterfaceClass(),
+ req.getMethodInstance(),
+ req.getMethodParameters(),
+ req.getPrimaryKey()
+ );
/* Multiple instances found */
if (result instanceof Collection) {
@@ -491,9 +491,9 @@ class EjbRequestHandler extends RequestH
} else {
final String message = "The bean is not EJB compliant. " +
- "The finder method [" + req.getMethodInstance().getName() + "] is declared " +
- "to return neither Collection nor the Remote Interface, " +
- "but [" + result.getClass().getName() + "]";
+ "The finder method [" + req.getMethodInstance().getName() + "] is declared " +
+ "to return neither Collection nor the Remote Interface, " +
+ "but [" + result.getClass().getName() + "]";
result = new RemoteException(message);
logger.error(req + " " + message);
res.setResponse(req.getVersion(), ResponseCodes.EJB_SYS_EXCEPTION, result);
@@ -522,13 +522,13 @@ class EjbRequestHandler extends RequestH
final RpcContainer c = (RpcContainer) call.getBeanContext().getContainer();
c.invoke(
- req.getDeploymentId(),
- InterfaceType.EJB_OBJECT,
- req.getInterfaceClass(),
- req.getMethodInstance(),
- req.getMethodParameters(),
- req.getPrimaryKey()
- );
+ req.getDeploymentId(),
+ InterfaceType.EJB_OBJECT,
+ req.getInterfaceClass(),
+ req.getMethodInstance(),
+ req.getMethodParameters(),
+ req.getPrimaryKey()
+ );
res.setResponse(req.getVersion(), ResponseCodes.EJB_OK, null);
}
@@ -547,13 +547,13 @@ class EjbRequestHandler extends RequestH
final RpcContainer c = (RpcContainer) call.getBeanContext().getContainer();
c.invoke(
- req.getDeploymentId(),
- InterfaceType.EJB_HOME,
- req.getInterfaceClass(),
- req.getMethodInstance(),
- req.getMethodParameters(),
- req.getPrimaryKey()
- );
+ req.getDeploymentId(),
+ InterfaceType.EJB_HOME,
+ req.getInterfaceClass(),
+ req.getMethodInstance(),
+ req.getMethodParameters(),
+ req.getPrimaryKey()
+ );
res.setResponse(req.getVersion(), ResponseCodes.EJB_OK, null);
}
@@ -564,13 +564,13 @@ class EjbRequestHandler extends RequestH
final RpcContainer c = (RpcContainer) call.getBeanContext().getContainer();
c.invoke(
- req.getDeploymentId(),
- InterfaceType.EJB_HOME,
- req.getInterfaceClass(),
- req.getMethodInstance(),
- req.getMethodParameters(),
- req.getPrimaryKey()
- );
+ req.getDeploymentId(),
+ InterfaceType.EJB_HOME,
+ req.getInterfaceClass(),
+ req.getMethodInstance(),
+ req.getMethodParameters(),
+ req.getPrimaryKey()
+ );
res.setResponse(req.getVersion(), ResponseCodes.EJB_OK, null);
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java Thu Jul 17 07:52:58 2014
@@ -103,7 +103,7 @@ class JndiRequestHandler extends Request
rootContext = containerSystem.getJNDIContext();
try {
clientJndiTree = (Context) containerSystem.getJNDIContext().lookup("openejb/client");
- } catch (NamingException ignore) {
+ } catch (final NamingException ignore) {
}
clusterableRequestHandler = newClusterableRequestHandler();
}
@@ -132,7 +132,7 @@ class JndiRequestHandler extends Request
try {
req.setMetaData(metaData);
req.readExternal(in);
- } catch (Throwable e) {
+ } catch (final Throwable e) {
res.setResponseCode(ResponseCodes.JNDI_NAMING_EXCEPTION);
final NamingException namingException = new NamingException("Could not read jndi request");
namingException.setRootCause(e);
@@ -141,7 +141,7 @@ class JndiRequestHandler extends Request
if (logger.isDebugEnabled()) {
try {
logRequestResponse(req, res);
- } catch (Exception ignore) {
+ } catch (final Exception ignore) {
// no-op
}
}
@@ -179,7 +179,7 @@ class JndiRequestHandler extends Request
}
}
- } catch (Throwable e) {
+ } catch (final Throwable e) {
res.setResponseCode(ResponseCodes.JNDI_NAMING_EXCEPTION);
final NamingException namingException = new NamingException("Unknown error in container");
namingException.setRootCause(e);
@@ -189,7 +189,7 @@ class JndiRequestHandler extends Request
try {
res.setMetaData(metaData);
res.writeExternal(out);
- } catch (Throwable e) {
+ } catch (final Throwable e) {
logger.fatal("Could not write JndiResponse to output stream", e);
}
@@ -197,7 +197,7 @@ class JndiRequestHandler extends Request
try {
out.flush(); // force it to as correct as possible response size
logRequestResponse(req, res);
- } catch (Exception ignore) {
+ } catch (final Exception ignore) {
// no-op
}
}
@@ -214,8 +214,8 @@ class JndiRequestHandler extends Request
final CountingOutputStream cos = info.getOutputStream();
logger.debug("JNDI REQUEST: " + req + " (size = " + (null != cis ? cis.getCount() : 0)
- + "b, remote-ip =" + info.ip
- + ") -- RESPONSE: " + res + " (size = " + (null != cos ? cos.getCount() : 0) + "b)");
+ + "b, remote-ip =" + info.ip
+ + ") -- RESPONSE: " + res + " (size = " + (null != cos ? cos.getCount() : 0) + "b)");
}
private String getPrefix(final JNDIRequest req) throws NamingException {
@@ -259,7 +259,7 @@ class JndiRequestHandler extends Request
} else {
try {
object = rootContext.lookup(prefix + name);
- } catch (NameNotFoundException nnfe) { // fallback to resources
+ } catch (final NameNotFoundException nnfe) { // fallback to resources
object = rootContext.lookup("openejb/Resource/" + name);
}
}
@@ -276,7 +276,7 @@ class JndiRequestHandler extends Request
final DataSourceMetaData dataSourceMetaData = new DataSourceMetaData(cf.getDriverClassName(), cf.getUrl(), cf.getUsername(), cf.getPassword());
res.setResponseCode(ResponseCodes.JNDI_DATA_SOURCE);
res.setResult(dataSourceMetaData);
- } catch (Exception e) {
+ } catch (final Exception e) {
res.setResponseCode(ResponseCodes.JNDI_ERROR);
res.setResult(new ThrowableArtifact(e));
}
@@ -419,10 +419,10 @@ class JndiRequestHandler extends Request
res.setResult(serviceMetaData);
return;
}
- } catch (NameNotFoundException e) {
+ } catch (final NameNotFoundException e) {
res.setResponseCode(ResponseCodes.JNDI_NOT_FOUND);
return;
- } catch (NamingException e) {
+ } catch (final NamingException e) {
res.setResponseCode(ResponseCodes.JNDI_NAMING_EXCEPTION);
res.setResult(new ThrowableArtifact(e));
return;
@@ -431,12 +431,12 @@ class JndiRequestHandler extends Request
BaseEjbProxyHandler handler;
try {
handler = (BaseEjbProxyHandler) ProxyManager.getInvocationHandler(object);
- } catch (Exception e) {
+ } catch (final Exception e) {
try {
final Field field = object.getClass().getDeclaredField("invocationHandler");
field.setAccessible(true);
handler = (BaseEjbProxyHandler) field.get(object);
- } catch (Exception e1) {
+ } catch (final Exception e1) {
// Not a proxy. See if it's serializable and send it
if (object instanceof java.io.Serializable) {
res.setResponseCode(ResponseCodes.JNDI_OK);
@@ -445,9 +445,9 @@ class JndiRequestHandler extends Request
} else {
res.setResponseCode(ResponseCodes.JNDI_NAMING_EXCEPTION);
final NamingException namingException = new NamingException("Expected an ejb proxy, found unknown object: type=" +
- object.getClass().getName() +
- ", toString=" +
- object);
+ object.getClass().getName() +
+ ", toString=" +
+ object);
res.setResult(new ThrowableArtifact(namingException));
return;
}
@@ -464,14 +464,14 @@ class JndiRequestHandler extends Request
case EJB_HOME: {
res.setResponseCode(ResponseCodes.JNDI_EJBHOME);
final EJBMetaDataImpl metaData = new EJBMetaDataImpl(beanContext.getHomeInterface(),
- beanContext.getRemoteInterface(),
- beanContext.getPrimaryKeyClass(),
- beanContext.getComponentType().toString(),
- deploymentID,
- -1,
- convert(proxyInfo.getInterfaceType()),
- null,
- beanContext.getAsynchronousMethodSignatures());
+ beanContext.getRemoteInterface(),
+ beanContext.getPrimaryKeyClass(),
+ beanContext.getComponentType().toString(),
+ deploymentID,
+ -1,
+ convert(proxyInfo.getInterfaceType()),
+ null,
+ beanContext.getAsynchronousMethodSignatures());
metaData.loadProperties(beanContext.getProperties());
log(metaData);
res.setResult(metaData);
@@ -480,22 +480,22 @@ class JndiRequestHandler extends Request
case EJB_LOCAL_HOME: {
res.setResponseCode(ResponseCodes.JNDI_NAMING_EXCEPTION);
final NamingException namingException = new NamingException("Not remotable: '" +
- name +
- "'. EJBLocalHome interfaces are not remotable as per the EJB specification.");
+ name +
+ "'. EJBLocalHome interfaces are not remotable as per the EJB specification.");
res.setResult(new ThrowableArtifact(namingException));
break;
}
case BUSINESS_REMOTE: {
res.setResponseCode(ResponseCodes.JNDI_BUSINESS_OBJECT);
final EJBMetaDataImpl metaData = new EJBMetaDataImpl(null,
- null,
- beanContext.getPrimaryKeyClass(),
- beanContext.getComponentType().toString(),
- deploymentID,
- -1,
- convert(proxyInfo.getInterfaceType()),
- proxyInfo.getInterfaces(),
- beanContext.getAsynchronousMethodSignatures());
+ null,
+ beanContext.getPrimaryKeyClass(),
+ beanContext.getComponentType().toString(),
+ deploymentID,
+ -1,
+ convert(proxyInfo.getInterfaceType()),
+ proxyInfo.getInterfaces(),
+ beanContext.getAsynchronousMethodSignatures());
metaData.setPrimaryKey(proxyInfo.getPrimaryKey());
metaData.loadProperties(beanContext.getProperties());
@@ -506,8 +506,8 @@ class JndiRequestHandler extends Request
case BUSINESS_LOCAL: {
res.setResponseCode(ResponseCodes.JNDI_NAMING_EXCEPTION);
final NamingException namingException = new NamingException("Not remotable: '" +
- name +
- "'. Business Local interfaces are not remotable as per the EJB specification. To disable this restriction, set the system property 'openejb.remotable.businessLocals=true' in the server.");
+ name +
+ "'. Business Local interfaces are not remotable as per the EJB specification. To disable this restriction, set the system property 'openejb.remotable.businessLocals=true' in the server.");
res.setResult(new ThrowableArtifact(namingException));
break;
}
@@ -567,9 +567,9 @@ class JndiRequestHandler extends Request
}
res.setResult(new NameClassPairEnumeration(list));
}
- } catch (NameNotFoundException e) {
+ } catch (final NameNotFoundException e) {
res.setResponseCode(ResponseCodes.JNDI_NOT_FOUND);
- } catch (NamingException e) {
+ } catch (final NamingException e) {
res.setResponseCode(ResponseCodes.JNDI_NAMING_EXCEPTION);
res.setResult(new ThrowableArtifact(e));
}
@@ -589,7 +589,7 @@ class JndiRequestHandler extends Request
public java.lang.String getDriverClassName() throws Exception {
try {
return (String) clazz.getMethod("getDriverClassName").invoke(object);
- } catch (NoSuchMethodException nsme) {
+ } catch (final NoSuchMethodException nsme) {
return (String) clazz.getMethod("getDriverClass").invoke(object);
}
}
@@ -601,7 +601,7 @@ class JndiRequestHandler extends Request
public java.lang.String getUrl() throws Exception {
try {
return (String) clazz.getMethod("getUrl").invoke(object);
- } catch (NoSuchMethodException nsme) {
+ } catch (final NoSuchMethodException nsme) {
return (String) clazz.getMethod("getJdbcUrl").invoke(object);
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/KeepAliveServer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/KeepAliveServer.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/KeepAliveServer.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/KeepAliveServer.java Thu Jul 17 07:52:58 2014
@@ -110,7 +110,7 @@ public class KeepAliveServer implements
try {
session.close();
- } catch (Throwable e) {
+ } catch (final Throwable e) {
//Ignore
} finally {
this.removeSession(session);
@@ -140,7 +140,7 @@ public class KeepAliveServer implements
if (l.tryLock()) {
try {
session.close();
- } catch (Throwable e) {
+ } catch (final Throwable e) {
//Ignore
} finally {
this.removeSession(session);
@@ -149,7 +149,7 @@ public class KeepAliveServer implements
} else if (logger.isDebugEnabled()) {
try {
logger.debug("Allowing graceful shutdown of " + session.socket.getInetAddress());
- } catch (Throwable e) {
+ } catch (final Throwable e) {
//Ignore
}
}
@@ -246,7 +246,7 @@ public class KeepAliveServer implements
while (KeepAliveServer.this.running.get()) {
try {
i = in.read();
- } catch (SocketException e) {
+ } catch (final SocketException e) {
// Socket closed.
break;
}
@@ -276,7 +276,7 @@ public class KeepAliveServer implements
try {
KeepAliveServer.this.service.service(new Input(in), new Output(out));
out.flush();
- } catch (SocketException e) {
+ } catch (final SocketException e) {
// Socket closed.
break;
}
@@ -285,9 +285,9 @@ public class KeepAliveServer implements
l2.unlock();
}
}
- } catch (ArrayIndexOutOfBoundsException e) {
+ } catch (final ArrayIndexOutOfBoundsException e) {
throw new IOException("Unexpected byte " + i);
- } catch (InterruptedIOException e) {
+ } catch (final InterruptedIOException e) {
Thread.interrupted();
} finally {
@@ -301,7 +301,7 @@ public class KeepAliveServer implements
if (null != in) {
try {
in.close();
- } catch (Throwable e) {
+ } catch (final Throwable e) {
//ignore
}
}
@@ -309,7 +309,7 @@ public class KeepAliveServer implements
if (null != out) {
try {
out.close();
- } catch (Throwable e) {
+ } catch (final Throwable e) {
//ignore
}
}
@@ -317,7 +317,7 @@ public class KeepAliveServer implements
if (null != socket) {
try {
socket.close();
- } catch (Throwable e) {
+ } catch (final Throwable e) {
//ignore
}
}
@@ -366,12 +366,12 @@ public class KeepAliveServer implements
if (this.running.getAndSet(false)) {
try {
this.closeSessions();
- } catch (Throwable e) {
+ } catch (final Throwable e) {
//Ignore
}
try {
this.timer.cancel();
- } catch (Throwable e) {
+ } catch (final Throwable e) {
//Ignore
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ServerSideResolver.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ServerSideResolver.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ServerSideResolver.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ServerSideResolver.java Thu Jul 17 07:52:58 2014
@@ -55,12 +55,12 @@ public class ServerSideResolver implemen
final BeanContext beanContext = containerSystem.getBeanContext(ejb.getDeploymentID());
return EjbHomeProxyHandler.createHomeProxy(beanContext, interfaceType, interfaces, ejb.getMainInterface());
- } catch (Exception e) {
+ } catch (final Exception e) {
Logger.getInstance(LogCategory.OPENEJB_SERVER_REMOTE, "org.apache.openejb.server.util.resources")
- .error("ServerSideResolver.resolve() failed, falling back to ClientSideResolver: " +
- e.getClass().getName() +
- ": " +
- e.getMessage(), e);
+ .error("ServerSideResolver.resolve() failed, falling back to ClientSideResolver: " +
+ e.getClass().getName() +
+ ": " +
+ e.getMessage(), e);
return new EJBHomeProxyHandle.ClientSideResovler().resolve(handler);
}
}
@@ -83,12 +83,12 @@ public class ServerSideResolver implemen
final BeanContext beanContext = containerSystem.getBeanContext(ejb.getDeploymentID());
return EjbObjectProxyHandler.createProxy(beanContext, handler.getPrimaryKey(), interfaceType, interfaces, ejb.getMainInterface());
- } catch (Exception e) {
+ } catch (final Exception e) {
Logger.getInstance(LogCategory.OPENEJB_SERVER_REMOTE, "org.apache.openejb.server.util.resources")
- .error("ServerSideResolver.resolve() failed, falling back to ClientSideResolver: " +
- e.getClass().getName() +
- ": " +
- e.getMessage(), e);
+ .error("ServerSideResolver.resolve() failed, falling back to ClientSideResolver: " +
+ e.getClass().getName() +
+ ": " +
+ e.getMessage(), e);
return new EJBObjectProxyHandle.ClientSideResovler().resolve(handler);
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/AuthTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/AuthTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/AuthTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/AuthTest.java Thu Jul 17 07:52:58 2014
@@ -33,22 +33,22 @@ import java.util.Properties;
public class AuthTest extends TestCase {
public void test() throws Exception {
- EjbServer ejbServer = new EjbServer();
+ final EjbServer ejbServer = new EjbServer();
- Properties initProps = new Properties();
+ final Properties initProps = new Properties();
initProps.put(DeploymentsResolver.DEPLOYMENTS_CLASSPATH_PROPERTY, Boolean.toString(false));
OpenEJB.init(initProps, new ServerFederation());
ejbServer.init(new Properties());
- ServiceDaemon serviceDaemon = new ServiceDaemon(ejbServer, 0, "localhost");
+ final ServiceDaemon serviceDaemon = new ServiceDaemon(ejbServer, 0, "localhost");
serviceDaemon.start();
- int port = serviceDaemon.getPort();
+ final int port = serviceDaemon.getPort();
try {
// good creds
- Properties props = new Properties();
+ final Properties props = new Properties();
props.put("java.naming.factory.initial", "org.apache.openejb.client.RemoteInitialContextFactory");
props.put("java.naming.provider.url", "ejbd://127.0.0.1:" + port);
props.put("openejb.authentication.realmName", "LM"); // reusing LoginModule from AuthentWithRequestTest since it is more specific
@@ -60,11 +60,11 @@ public class AuthTest extends TestCase {
props.put(Context.SECURITY_PRINCIPAL, "alfred");
props.put(Context.SECURITY_CREDENTIALS, "doesnotexist");
new InitialContext(props);
- } catch (javax.naming.AuthenticationException e) {
+ } catch (final javax.naming.AuthenticationException e) {
// pass -- user does not exist
}
- } catch (NamingException e) {
+ } catch (final NamingException e) {
throw e;
} finally {
serviceDaemon.stop();
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/AuthentWithRequestTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/AuthentWithRequestTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/AuthentWithRequestTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/AuthentWithRequestTest.java Thu Jul 17 07:52:58 2014
@@ -84,13 +84,13 @@ public class AuthentWithRequestTest {
try {
final Context context = new InitialContext(new PropertiesBuilder()
- .p(Context.INITIAL_CONTEXT_FACTORY, RemoteInitialContextFactory.class.getName())
- .p(Context.PROVIDER_URL, "ejbd://127.0.0.1:" + port)
- .p(JNDIContext.AUTHENTICATE_WITH_THE_REQUEST, "true")
- .p("java.naming.security.principal", "foo")
- .p("java.naming.security.credentials", "bar")
- .p("openejb.authentication.realmName", "LM")
- .build());
+ .p(Context.INITIAL_CONTEXT_FACTORY, RemoteInitialContextFactory.class.getName())
+ .p(Context.PROVIDER_URL, "ejbd://127.0.0.1:" + port)
+ .p(JNDIContext.AUTHENTICATE_WITH_THE_REQUEST, "true")
+ .p("java.naming.security.principal", "foo")
+ .p("java.naming.security.credentials", "bar")
+ .p("openejb.authentication.realmName", "LM")
+ .build());
final AnInterfaceRemote client = AnInterfaceRemote.class.cast(context.lookup("RemoteWithSecurityRemote"));
assertNotNull(client);
@@ -123,7 +123,7 @@ public class AuthentWithRequestTest {
private CallbackHandler callbackHandler;
@Override
- public void initialize(Subject subject, CallbackHandler callbackHandler, Map<String, ?> sharedState, Map<String, ?> options) {
+ public void initialize(final Subject subject, final CallbackHandler callbackHandler, final Map<String, ?> sharedState, final Map<String, ?> options) {
this.callbackHandler = callbackHandler;
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/JndiTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/JndiTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/JndiTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/JndiTest.java Thu Jul 17 07:52:58 2014
@@ -43,22 +43,22 @@ import java.util.Properties;
public class JndiTest extends TestCase {
public void test() throws Exception {
- EjbServer ejbServer = new EjbServer();
+ final EjbServer ejbServer = new EjbServer();
- Properties initProps = new Properties();
+ final Properties initProps = new Properties();
initProps.put(DeploymentsResolver.DEPLOYMENTS_CLASSPATH_PROPERTY, Boolean.toString(false));
OpenEJB.init(initProps, new ServerFederation());
ejbServer.init(new Properties());
- ServiceDaemon serviceDaemon = new ServiceDaemon(ejbServer, 0, "localhost");
+ final ServiceDaemon serviceDaemon = new ServiceDaemon(ejbServer, 0, "localhost");
serviceDaemon.start();
- int port = serviceDaemon.getPort();
+ final int port = serviceDaemon.getPort();
- Assembler assembler = SystemInstance.get().getComponent(Assembler.class);
- ConfigurationFactory config = new ConfigurationFactory();
+ final Assembler assembler = SystemInstance.get().getComponent(Assembler.class);
+ final ConfigurationFactory config = new ConfigurationFactory();
- EjbJar ejbJar = new EjbJar();
+ final EjbJar ejbJar = new EjbJar();
ejbJar.addEnterpriseBean(new StatelessBean("Orange", Fruit.class));
ejbJar.addEnterpriseBean(new StatelessBean("Apple", Fruit.class));
ejbJar.addEnterpriseBean(new StatelessBean("Peach", Fruit.class));
@@ -74,10 +74,10 @@ public class JndiTest extends TestCase {
try {
// good creds
- Properties props = new Properties();
+ final Properties props = new Properties();
props.put("java.naming.factory.initial", "org.apache.openejb.client.RemoteInitialContextFactory");
props.put("java.naming.provider.url", "ejbd://127.0.0.1:" + port);
- Context context = new InitialContext(props);
+ final Context context = new InitialContext(props);
assertNameClassPair(context.list(""));
assertNameClassPair(context.list("ejb"));
@@ -92,12 +92,12 @@ public class JndiTest extends TestCase {
}
- private void assertNameClassPair(NamingEnumeration<NameClassPair> namingEnumeration) {
+ private void assertNameClassPair(final NamingEnumeration<NameClassPair> namingEnumeration) {
assertNotNull("namingEnumeration", namingEnumeration);
- Map<String, String> map = new HashMap<String, String>();
+ final Map<String, String> map = new HashMap<String, String>();
while (namingEnumeration.hasMoreElements()) {
- NameClassPair pair = namingEnumeration.nextElement();
+ final NameClassPair pair = namingEnumeration.nextElement();
map.put(pair.getName(), pair.getClassName());
}
@@ -108,12 +108,12 @@ public class JndiTest extends TestCase {
assertTrue("PlumRemote", map.containsKey("PlumRemote"));
}
- private void assertBindings(NamingEnumeration<Binding> namingEnumeration) {
+ private void assertBindings(final NamingEnumeration<Binding> namingEnumeration) {
assertNotNull("namingEnumeration", namingEnumeration);
- Map<String, Object> map = new HashMap<String, Object>();
+ final Map<String, Object> map = new HashMap<String, Object>();
while (namingEnumeration.hasMoreElements()) {
- Binding pair = namingEnumeration.nextElement();
+ final Binding pair = namingEnumeration.nextElement();
map.put(pair.getName(), pair.getObject());
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/RemoteiTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/RemoteiTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/RemoteiTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/RemoteiTest.java Thu Jul 17 07:52:58 2014
@@ -57,7 +57,7 @@ public class RemoteiTest extends org.apa
}
public static Test suite() {
- TestSuite suite = new RemoteiTest();
+ final TestSuite suite = new RemoteiTest();
suite.addTest(SingletonTestSuite.suite());
suite.addTest(StatelessTestSuite.suite());
suite.addTest(StatefulTestSuite.suite());
@@ -72,9 +72,9 @@ public class RemoteiTest extends org.apa
private ServiceDaemon serviceDaemon;
private int port;
- public void init(Properties props) {
+ public void init(final Properties props) {
try {
- EjbServer ejbServer = new EjbServer();
+ final EjbServer ejbServer = new EjbServer();
// classpath should be scanned...
props.put("openejb.deployments.classpath", "true");
// ...and only the openejb-itests-beans should be considered as a deployment
@@ -87,7 +87,7 @@ public class RemoteiTest extends org.apa
serviceDaemon = new ServiceDaemon(ejbServer, 0, "localhost");
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new RuntimeException("Unable to initialize Test Server.", e);
}
}
@@ -96,7 +96,7 @@ public class RemoteiTest extends org.apa
try {
serviceDaemon.start();
port = serviceDaemon.getPort();
- } catch (ServiceException e) {
+ } catch (final ServiceException e) {
throw new RuntimeException("Unable to start Test Server.", e);
}
}
@@ -104,13 +104,13 @@ public class RemoteiTest extends org.apa
public void stop() {
try {
serviceDaemon.stop();
- } catch (ServiceException e) {
+ } catch (final ServiceException e) {
throw new RuntimeException("Unable to stop Test Server.", e);
}
}
public Properties getContextEnvironment() {
- Properties props = new Properties();
+ final Properties props = new Properties();
props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.RemoteInitialContextFactory");
props.put(Context.PROVIDER_URL, "ejbd://localhost:" + port);
return props;
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/SerializerTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/SerializerTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/SerializerTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/SerializerTest.java Thu Jul 17 07:52:58 2014
@@ -113,7 +113,7 @@ public class SerializerTest {
public static class AnEjbRemote implements AnInterfaceRemote {
@Override
- public OutputNotSerializable call(InputNotSerilizable input) {
+ public OutputNotSerializable call(final InputNotSerilizable input) {
return new OutputNotSerializable(input.rename);
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/AppClientTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/AppClientTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/AppClientTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/AppClientTest.java Thu Jul 17 07:52:58 2014
@@ -64,7 +64,7 @@ public class AppClientTest extends TestC
final ServiceDaemon serviceDaemon = new ServiceDaemon(pool, 0, "localhost");
serviceDaemon.start();
- int port = serviceDaemon.getPort();
+ final int port = serviceDaemon.getPort();
final Assembler assembler = SystemInstance.get().getComponent(Assembler.class);
final ConfigurationFactory config = new ConfigurationFactory();
@@ -94,13 +94,13 @@ public class AppClientTest extends TestC
final Object home = context.lookup("comp/env/home");
assertTrue(home instanceof OrangeHome);
- OrangeHome orangeHome = (OrangeHome) home;
+ final OrangeHome orangeHome = (OrangeHome) home;
final OrangeRemote orangeRemote = orangeHome.create();
assertEquals("bat", orangeRemote.echo("tab"));
final Object business = context.lookup("comp/env/business");
assertTrue(business instanceof OrangeBusinessRemote);
- OrangeBusinessRemote orangeBusinessRemote = (OrangeBusinessRemote) business;
+ final OrangeBusinessRemote orangeBusinessRemote = (OrangeBusinessRemote) business;
assertEquals("nap", orangeBusinessRemote.echo("pan"));
final Object dataSourceObject = context.lookup("comp/env/datasource");
@@ -113,7 +113,7 @@ public class AppClientTest extends TestC
final Object global = context.lookup("global/testapp/testejbmodule/Orange!" + OrangeBusinessRemote.class.getName());
assertTrue(global instanceof OrangeBusinessRemote);
- OrangeBusinessRemote globalOrangeBusinessRemote = (OrangeBusinessRemote) global;
+ final OrangeBusinessRemote globalOrangeBusinessRemote = (OrangeBusinessRemote) global;
assertEquals("nap", globalOrangeBusinessRemote.echo("pan"));
}
@@ -138,7 +138,7 @@ public class AppClientTest extends TestC
public static class Orange implements OrangeBusinessRemote {
@Override
- public String echo(String string) {
+ public String echo(final String string) {
return new StringBuilder(string).reverse().toString();
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/BasicClusterableRequestHandlerTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/BasicClusterableRequestHandlerTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/BasicClusterableRequestHandlerTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/BasicClusterableRequestHandlerTest.java Thu Jul 17 07:52:58 2014
@@ -46,20 +46,20 @@ public class BasicClusterableRequestHand
response = (ClusterableResponse) mock(ClusterableResponse.class);
clusteredContainer = (ClusteredRPCContainer) mock(ClusteredRPCContainer.class);
beanContext = new BeanContext("aDeploymentId",
- null,
- new ModuleContext("", null, "", new AppContext("", SystemInstance.get(), null, null, null, false), null, null),
- BasicClusterableRequestHandlerTest.class,
- null,
- null,
- null,
- null,
- null,
- null,
- null,
- null,
- null,
- null,
- false);
+ null,
+ new ModuleContext("", null, "", new AppContext("", SystemInstance.get(), null, null, null, false), null, null),
+ BasicClusterableRequestHandlerTest.class,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ false);
}
public void testNoOpWhenNotAClusteredContainer() throws Exception {
@@ -73,7 +73,7 @@ public class BasicClusterableRequestHand
public void testUpdateServerWhenRequestHashDiffersFromServerSideHash() throws Exception {
final int port = SystemInstance.get().getOptions().get("ejbd.port", 4201);
final URI[] locations = new URI[]{new URI("ejbd://localhost:" + port)};
- ServerMetaData server = new ServerMetaData(locations);
+ final ServerMetaData server = new ServerMetaData(locations);
beanContext.setContainer(clusteredContainer);
@@ -83,12 +83,12 @@ public class BasicClusterableRequestHand
response.setServer(null);
modify().args(new AbstractExpression() {
@Override
- public void describeWith(ExpressionDescriber arg0) throws IOException {
+ public void describeWith(final ExpressionDescriber arg0) throws IOException {
}
@Override
- public boolean passes(Object arg0) {
- ServerMetaData actualServer = (ServerMetaData) arg0;
+ public boolean passes(final Object arg0) {
+ final ServerMetaData actualServer = (ServerMetaData) arg0;
assertSame(locations, actualServer.getLocations());
return true;
}
@@ -104,8 +104,8 @@ public class BasicClusterableRequestHand
public void testServerIsNotUpdatedWhenRequestHashEqualsServerSideHash() throws Exception {
final int port = SystemInstance.get().getOptions().get("ejbd.port", 4201);
- URI[] locations = new URI[]{new URI("ejbd://localhost:" + port)};
- ServerMetaData server = new ServerMetaData(locations);
+ final URI[] locations = new URI[]{new URI("ejbd://localhost:" + port)};
+ final ServerMetaData server = new ServerMetaData(locations);
beanContext.setContainer(clusteredContainer);
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/ClientMulticastDiscoveryTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/ClientMulticastDiscoveryTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/ClientMulticastDiscoveryTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/ClientMulticastDiscoveryTest.java Thu Jul 17 07:52:58 2014
@@ -174,7 +174,7 @@ public class ClientMulticastDiscoveryTes
try {
uri = new URI("ejb:ejbd://localhost:" + getPort() + "/" + host);
agent.registerService(uri);
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new ServiceException(e);
}
}
@@ -184,7 +184,7 @@ public class ClientMulticastDiscoveryTes
super.stop();
try {
agent.unregisterService(uri);
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new ServiceException(e);
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/DeploymentIndexTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/DeploymentIndexTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/DeploymentIndexTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/DeploymentIndexTest.java Thu Jul 17 07:52:58 2014
@@ -41,20 +41,20 @@ public class DeploymentIndexTest {
public void setUp() throws SystemException {
method = Method.class.getMethods()[0];
beanContext = new BeanContext("aDeploymentId",
- null,
- new ModuleContext("", null, "", new AppContext("", SystemInstance.get(), null, null, null, false), null, null),
- DeploymentIndexTest.class,
- null,
- null,
- null,
- null,
- null,
- null,
- null,
- null,
- null,
- null,
- false);
+ null,
+ new ModuleContext("", null, "", new AppContext("", SystemInstance.get(), null, null, null, false), null, null),
+ DeploymentIndexTest.class,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ false);
deploymentIndex = new DeploymentIndex(new BeanContext[]{beanContext, beanContext});
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/DynamicConnectionStrategyTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/DynamicConnectionStrategyTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/DynamicConnectionStrategyTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/DynamicConnectionStrategyTest.java Thu Jul 17 07:52:58 2014
@@ -51,39 +51,39 @@ public class DynamicConnectionStrategyTe
public void test() throws Exception {
ConnectionManager.registerStrategy("test", new TestConnectionStrategy());
- EjbServer ejbServer = new EjbServer();
+ final EjbServer ejbServer = new EjbServer();
- Properties initProps = new Properties();
+ final Properties initProps = new Properties();
initProps.setProperty("openejb.deployments.classpath.include", "");
initProps.setProperty("openejb.deployments.classpath.filter.descriptors", "true");
OpenEJB.init(initProps, new ServerFederation());
ejbServer.init(new Properties());
- ServicePool pool = new ServicePool(ejbServer, 10);
- ServiceDaemon serviceDaemon = new ServiceDaemon(pool, 0, "localhost");
+ final ServicePool pool = new ServicePool(ejbServer, 10);
+ final ServiceDaemon serviceDaemon = new ServiceDaemon(pool, 0, "localhost");
serviceDaemon.start();
- int port = serviceDaemon.getPort();
+ final int port = serviceDaemon.getPort();
- Assembler assembler = SystemInstance.get().getComponent(Assembler.class);
- ConfigurationFactory config = new ConfigurationFactory();
+ final Assembler assembler = SystemInstance.get().getComponent(Assembler.class);
+ final ConfigurationFactory config = new ConfigurationFactory();
- EjbModule ejbModule = new EjbModule(new EjbJar(), new OpenejbJar());
- EjbJar ejbJar = ejbModule.getEjbJar();
- OpenejbJar openejbJar = ejbModule.getOpenejbJar();
+ final EjbModule ejbModule = new EjbModule(new EjbJar(), new OpenejbJar());
+ final EjbJar ejbJar = ejbModule.getEjbJar();
+ final OpenejbJar openejbJar = ejbModule.getOpenejbJar();
- StatelessBean statelessBean = ejbJar.addEnterpriseBean(new StatelessBean(WidgetBean.class));
- EjbDeployment deployment = openejbJar.addEjbDeployment(statelessBean);
+ final StatelessBean statelessBean = ejbJar.addEnterpriseBean(new StatelessBean(WidgetBean.class));
+ final EjbDeployment deployment = openejbJar.addEjbDeployment(statelessBean);
deployment.getProperties().put("openejb.client.connection.strategy", "test");
assembler.createApplication(config.configureApplication(ejbModule));
- Properties props = new Properties();
+ final Properties props = new Properties();
props.put("java.naming.factory.initial", "org.apache.openejb.client.RemoteInitialContextFactory");
props.put("java.naming.provider.url", "ejbd://127.0.0.1:" + port);
- Context context = new InitialContext(props);
+ final Context context = new InitialContext(props);
- Widget remote = (Widget) context.lookup("WidgetBeanRemote");
+ final Widget remote = (Widget) context.lookup("WidgetBeanRemote");
assertFalse(TestConnectionStrategy.called.get());
@@ -100,7 +100,7 @@ public class DynamicConnectionStrategyTe
public static class WidgetBean implements Widget {
- public Object echo(Object o) {
+ public Object echo(final Object o) {
return o;
}
}
@@ -111,7 +111,7 @@ public class DynamicConnectionStrategyTe
private final StickyConnectionStrategy strategy = new StickyConnectionStrategy();
- public Connection connect(ClusterMetaData cluster, ServerMetaData server) throws IOException {
+ public Connection connect(final ClusterMetaData cluster, final ServerMetaData server) throws IOException {
called.set(true);
return strategy.connect(cluster, server);
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/EjbdJmxTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/EjbdJmxTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/EjbdJmxTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/EjbdJmxTest.java Thu Jul 17 07:52:58 2014
@@ -54,11 +54,11 @@ public class EjbdJmxTest {
ServiceManager.register("ejbd", service, server);
- ObjectName invocationsName = new ObjectName("openejb:type=ServerService,name=ejbd");
+ final ObjectName invocationsName = new ObjectName("openejb:type=ServerService,name=ejbd");
- MBeanInfo beanInfo = server.getMBeanInfo(invocationsName);
+ final MBeanInfo beanInfo = server.getMBeanInfo(invocationsName);
- for (MBeanAttributeInfo info : beanInfo.getAttributes()) {
+ for (final MBeanAttributeInfo info : beanInfo.getAttributes()) {
System.out.println(info);
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/FailoverConnectionFactoryTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/FailoverConnectionFactoryTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/FailoverConnectionFactoryTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/FailoverConnectionFactoryTest.java Thu Jul 17 07:52:58 2014
@@ -51,39 +51,39 @@ public class FailoverConnectionFactoryTe
public void test() throws Exception {
ConnectionManager.registerStrategy("test", new TestConnectionStrategy());
- EjbServer ejbServer = new EjbServer();
+ final EjbServer ejbServer = new EjbServer();
- Properties initProps = new Properties();
+ final Properties initProps = new Properties();
initProps.setProperty("openejb.deployments.classpath.include", "");
initProps.setProperty("openejb.deployments.classpath.filter.descriptors", "true");
OpenEJB.init(initProps, new ServerFederation());
ejbServer.init(new Properties());
- ServicePool pool = new ServicePool(ejbServer, 10);
- ServiceDaemon serviceDaemon = new ServiceDaemon(pool, 0, "localhost");
+ final ServicePool pool = new ServicePool(ejbServer, 10);
+ final ServiceDaemon serviceDaemon = new ServiceDaemon(pool, 0, "localhost");
serviceDaemon.start();
- int port = serviceDaemon.getPort();
+ final int port = serviceDaemon.getPort();
- Assembler assembler = SystemInstance.get().getComponent(Assembler.class);
- ConfigurationFactory config = new ConfigurationFactory();
+ final Assembler assembler = SystemInstance.get().getComponent(Assembler.class);
+ final ConfigurationFactory config = new ConfigurationFactory();
- EjbModule ejbModule = new EjbModule(new EjbJar(), new OpenejbJar());
- EjbJar ejbJar = ejbModule.getEjbJar();
- OpenejbJar openejbJar = ejbModule.getOpenejbJar();
+ final EjbModule ejbModule = new EjbModule(new EjbJar(), new OpenejbJar());
+ final EjbJar ejbJar = ejbModule.getEjbJar();
+ final OpenejbJar openejbJar = ejbModule.getOpenejbJar();
- StatelessBean statelessBean = ejbJar.addEnterpriseBean(new StatelessBean(WidgetBean.class));
- EjbDeployment deployment = openejbJar.addEjbDeployment(statelessBean);
+ final StatelessBean statelessBean = ejbJar.addEnterpriseBean(new StatelessBean(WidgetBean.class));
+ final EjbDeployment deployment = openejbJar.addEjbDeployment(statelessBean);
deployment.getProperties().put("openejb.client.connection.strategy", "test");
assembler.createApplication(config.configureApplication(ejbModule));
- Properties props = new Properties();
+ final Properties props = new Properties();
props.put("java.naming.factory.initial", "org.apache.openejb.client.RemoteInitialContextFactory");
props.put("java.naming.provider.url", "failover:sticky:ejbd://agwdt:9999,ejbd://127.0.0.1:" + port);
- Context context = new InitialContext(props);
+ final Context context = new InitialContext(props);
- Widget remote = (Widget) context.lookup("WidgetBeanRemote");
+ final Widget remote = (Widget) context.lookup("WidgetBeanRemote");
assertFalse(TestConnectionStrategy.called.get());
@@ -100,7 +100,7 @@ public class FailoverConnectionFactoryTe
public static class WidgetBean implements Widget {
- public Object echo(Object o) {
+ public Object echo(final Object o) {
return o;
}
}
@@ -111,7 +111,7 @@ public class FailoverConnectionFactoryTe
private final StickyConnectionStrategy strategy = new StickyConnectionStrategy();
- public Connection connect(ClusterMetaData cluster, ServerMetaData server) throws IOException {
+ public Connection connect(final ClusterMetaData cluster, final ServerMetaData server) throws IOException {
called.set(true);
return strategy.connect(cluster, server);
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/FailoverTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/FailoverTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/FailoverTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/FailoverTest.java Thu Jul 17 07:52:58 2014
@@ -64,7 +64,7 @@ public class FailoverTest extends TestCa
initProps.setProperty("openejb.deployments.classpath.include", "");
initProps.setProperty("openejb.deployments.classpath.filter.descriptors", "true");
OpenEJB.init(initProps, new ServerFederation());
- } catch (Exception e) {
+ } catch (final Exception e) {
}
final Assembler assembler = SystemInstance.get().getComponent(Assembler.class);
final ConfigurationFactory config = new ConfigurationFactory();
@@ -100,7 +100,7 @@ public class FailoverTest extends TestCa
try {
target.getHost();
fail("EJBException should have been thrown");
- } catch (EJBException e) {
+ } catch (final EJBException e) {
// pass
}
@@ -119,7 +119,7 @@ public class FailoverTest extends TestCa
initProps.setProperty("openejb.deployments.classpath.include", "");
initProps.setProperty("openejb.deployments.classpath.filter.descriptors", "true");
OpenEJB.init(initProps, new ServerFederation());
- } catch (Exception e) {
+ } catch (final Exception e) {
}
final Assembler assembler = SystemInstance.get().getComponent(Assembler.class);
final ConfigurationFactory config = new ConfigurationFactory();
@@ -150,7 +150,7 @@ public class FailoverTest extends TestCa
try {
target.getHost();
fail("EJBException should have been thrown");
- } catch (EJBException e) {
+ } catch (final EJBException e) {
// pass
}
@@ -245,7 +245,7 @@ public class FailoverTest extends TestCa
try {
uri = new URI("ejb:ejbd://localhost:" + getPort() + "/" + host);
agent.registerService(uri);
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new ServiceException(e);
}
}
@@ -255,7 +255,7 @@ public class FailoverTest extends TestCa
super.stop();
try {
agent.unregisterService(uri);
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new ServiceException(e);
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/FullPoolFailoverTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/FullPoolFailoverTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/FullPoolFailoverTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/FullPoolFailoverTest.java Thu Jul 17 07:52:58 2014
@@ -74,7 +74,7 @@ public class FullPoolFailoverTest extend
paused = new CountingLatch(10);
// Do a business method...
- Runnable r = new Runnable() {
+ final Runnable r = new Runnable() {
public void run() {
counter.hit();
}
@@ -83,7 +83,7 @@ public class FullPoolFailoverTest extend
hold.add(red);
for (int i = 0; i < 10; i++) {
- Thread t = new Thread(r);
+ final Thread t = new Thread(r);
t.start();
}
@@ -92,7 +92,7 @@ public class FullPoolFailoverTest extend
if (!paused.await(3000, TimeUnit.MILLISECONDS)) {
System.out.println();
}
- } catch (Throwable t) {
+ } catch (final Throwable t) {
System.out.println();
}
assertTrue("expected 10 invocations", paused.await(3000, TimeUnit.MILLISECONDS));
@@ -100,7 +100,7 @@ public class FullPoolFailoverTest extend
assertEquals(10, CounterBean.instances.get());
assertEquals(10, hits.size());
- List<URI> expected = new ArrayList<URI>();
+ final List<URI> expected = new ArrayList<URI>();
for (int i = 0; i < 10; i++) {
expected.add(red);
}
@@ -111,7 +111,7 @@ public class FullPoolFailoverTest extend
try {
counter.hit();
fail("Expected ConcurrentAccessTimeoutException");
- } catch (ConcurrentAccessTimeoutException e) {
+ } catch (final ConcurrentAccessTimeoutException e) {
// both "red" and "blue" servers are technically using the
// same stateless session bean pool, which is fully busy
// but ... this exception should have come from the "blue" server
@@ -128,7 +128,7 @@ public class FullPoolFailoverTest extend
try {
counter.hit();
fail("Expected ConcurrentAccessTimeoutException");
- } catch (ConcurrentAccessTimeoutException e) {
+ } catch (final ConcurrentAccessTimeoutException e) {
}
expected.add(blue);
@@ -150,7 +150,7 @@ public class FullPoolFailoverTest extend
paused = new CountingLatch(10);
// Do a business method...
- Runnable r = new Runnable() {
+ final Runnable r = new Runnable() {
public void run() {
counter.hit();
}
@@ -158,11 +158,11 @@ public class FullPoolFailoverTest extend
hold.add(red);
- List<URI> expected = new ArrayList<URI>();
+ final List<URI> expected = new ArrayList<URI>();
for (int i = 0; i < 10; i++) {
expected.add(red);
- Thread t = new Thread(r);
+ final Thread t = new Thread(r);
t.start();
}
@@ -174,7 +174,7 @@ public class FullPoolFailoverTest extend
assertEquals(expected, hits);
// This one should failover to the blue server
- URI uri = counter.hit();
+ final URI uri = counter.hit();
assertEquals(blue, uri);
// the red pool is fully busy, so we should have failed over to blue
@@ -187,7 +187,7 @@ public class FullPoolFailoverTest extend
for (int i = 0; i < 10; i++) {
paused.countUp();
expected.add(blue);
- Thread t = new Thread(r);
+ final Thread t = new Thread(r);
t.start();
}
@@ -202,7 +202,7 @@ public class FullPoolFailoverTest extend
try {
counter.hit();
fail("Expected javax.ejb.EJBException");
- } catch (javax.ejb.EJBException e) {
+ } catch (final javax.ejb.EJBException e) {
}
// there should be no hits on any server, both connection pools are fully busy
@@ -215,7 +215,7 @@ public class FullPoolFailoverTest extend
protected void tearDown() throws Exception {
super.tearDown();
- for (ServiceDaemon daemon : daemons) {
+ for (final ServiceDaemon daemon : daemons) {
daemon.stop();
}
@@ -224,25 +224,25 @@ public class FullPoolFailoverTest extend
private final List<ServiceDaemon> daemons = new ArrayList<ServiceDaemon>();
- protected void setup(int statelessPoolSize, int connectionPoolSize) throws Exception {
- Properties initProps = new Properties();
+ protected void setup(final int statelessPoolSize, final int connectionPoolSize) throws Exception {
+ final Properties initProps = new Properties();
initProps.setProperty("openejb.deployments.classpath.include", "");
initProps.setProperty("openejb.deployments.classpath.filter.descriptors", "true");
OpenEJB.init(initProps, new ServerFederation());
System.setProperty(org.apache.openejb.client.SocketConnectionFactory.PROPERTY_POOL_SIZE, "" + connectionPoolSize);
- EjbServer ejbServer = new EjbServer();
+ final EjbServer ejbServer = new EjbServer();
ejbServer.init(new Properties());
daemons.add(createServiceDaemon(connectionPoolSize, ejbServer, red));
daemons.add(createServiceDaemon(connectionPoolSize, ejbServer, blue));
- ConfigurationFactory config = new ConfigurationFactory();
- Assembler assembler = SystemInstance.get().getComponent(Assembler.class);
+ final ConfigurationFactory config = new ConfigurationFactory();
+ final Assembler assembler = SystemInstance.get().getComponent(Assembler.class);
// containers
- StatelessSessionContainerInfo statelessContainerInfo = config.configureService(StatelessSessionContainerInfo.class);
+ final StatelessSessionContainerInfo statelessContainerInfo = config.configureService(StatelessSessionContainerInfo.class);
statelessContainerInfo.properties.setProperty("TimeOut", "100");
statelessContainerInfo.properties.setProperty("PoolSize", "" + statelessPoolSize);
statelessContainerInfo.properties.setProperty("MinSize", "2");
@@ -251,13 +251,13 @@ public class FullPoolFailoverTest extend
// Setup the descriptor information
- StatelessBean bean = new StatelessBean(CounterBean.class);
+ final StatelessBean bean = new StatelessBean(CounterBean.class);
bean.addBusinessLocal(Counter.class.getName());
bean.addBusinessRemote(RemoteCounter.class.getName());
bean.addPostConstruct("init");
bean.addPreDestroy("destroy");
- EjbJar ejbJar = new EjbJar();
+ final EjbJar ejbJar = new EjbJar();
ejbJar.addEnterpriseBean(bean);
CounterBean.instances.set(0);
@@ -267,21 +267,21 @@ public class FullPoolFailoverTest extend
failoverURI += "ejbd://127.0.0.1:" + daemons.get(0).getPort() + "?red,";
failoverURI += "ejbd://127.0.0.1:" + daemons.get(1).getPort() + "?blue";
- Properties props = new Properties();
+ final Properties props = new Properties();
props.put("java.naming.factory.initial", "org.apache.openejb.client.RemoteInitialContextFactory");
props.put("java.naming.provider.url", failoverURI);
- Context context = new InitialContext(props);
+ final Context context = new InitialContext(props);
counter = (Counter) context.lookup("CounterBeanRemote");
hold.clear();
hits.clear();
}
- private ServiceDaemon createServiceDaemon(int poolSize, EjbServer ejbServer, URI uri) throws ServiceException {
- ServiceIdentifier serviceIdentifier = new ServiceIdentifier(ejbServer, uri);
- KeepAliveServer keepAliveServer = new KeepAliveServer(serviceIdentifier);
- ServicePool pool = new ServicePool(keepAliveServer, poolSize);
- ServiceDaemon daemon = new ServiceDaemon(pool, 0, "localhost");
+ private ServiceDaemon createServiceDaemon(final int poolSize, final EjbServer ejbServer, final URI uri) throws ServiceException {
+ final ServiceIdentifier serviceIdentifier = new ServiceIdentifier(ejbServer, uri);
+ final KeepAliveServer keepAliveServer = new KeepAliveServer(serviceIdentifier);
+ final ServicePool pool = new ServicePool(keepAliveServer, poolSize);
+ final ServiceDaemon daemon = new ServiceDaemon(pool, 0, "localhost");
daemon.start();
return daemon;
}
@@ -292,13 +292,13 @@ public class FullPoolFailoverTest extend
private final URI me;
- public ServiceIdentifier(ServerService service, URI me) {
+ public ServiceIdentifier(final ServerService service, final URI me) {
super(service);
this.me = me;
}
@Override
- public void service(InputStream in, OutputStream out) throws ServiceException, IOException {
+ public void service(final InputStream in, final OutputStream out) throws ServiceException, IOException {
synchronized (hits) {
hits.add(me);
}
@@ -313,7 +313,7 @@ public class FullPoolFailoverTest extend
public static Object lock = new Object[]{};
- private static void comment(String x) {
+ private static void comment(final String x) {
// synchronized(lock){
// System.out.println(x);
// System.out.flush();
@@ -348,13 +348,13 @@ public class FullPoolFailoverTest extend
}
public URI hit() {
- URI uri = host.get();
+ final URI uri = host.get();
if (hold.contains(uri)) {
try {
paused.countDown();
resume.await();
- } catch (InterruptedException e) {
+ } catch (final InterruptedException e) {
Thread.interrupted();
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/KeepAilveTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/KeepAilveTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/KeepAilveTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/KeepAilveTest.java Thu Jul 17 07:52:58 2014
@@ -77,7 +77,7 @@ public class KeepAilveTest extends TestC
private void waitOneSecond() {
try {
Thread.sleep(1000);
- } catch (InterruptedException e) {
+ } catch (final InterruptedException e) {
e.printStackTrace();
}
}
@@ -187,7 +187,7 @@ public class KeepAilveTest extends TestC
Assert.assertEquals(message, reverse(response));
try {
Thread.sleep(5000);
- } catch (InterruptedException e) {
+ } catch (final InterruptedException e) {
e.printStackTrace();
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/MultithreadTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/MultithreadTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/MultithreadTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/MultithreadTest.java Thu Jul 17 07:52:58 2014
@@ -111,7 +111,7 @@ public class MultithreadTest {
public void run() {
try {
counter.explode();
- } catch (Exception e) {
+ } catch (final Exception e) {
//Ignore
}
}
@@ -146,11 +146,11 @@ public class MultithreadTest {
public void run() {
try {
counter.race();
- } catch (ConcurrentAccessException ex) {
+ } catch (final ConcurrentAccessException ex) {
comment("Leap Start");
timeouts.countDown();
assertEquals("No instances available in Stateless Session Bean pool. Waited 100 MILLISECONDS", ex.getMessage());
- } catch (Throwable t) {
+ } catch (final Throwable t) {
error.set(t);
fail("Unexpected exception" + t.getClass().getName() + " " + t.getMessage()); // useless in another thread
}
@@ -304,7 +304,7 @@ public class MultithreadTest {
try {
startPistol.await();
comment("running = " + count);
- } catch (InterruptedException e) {
+ } catch (final InterruptedException e) {
Thread.interrupted();
}
}