You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by tv...@apache.org on 2014/02/19 16:48:09 UTC
svn commit: r1569795 [21/35] - in
/tomee/tomee/trunk/container/openejb-core/src/main: config/pmd/
java/javax/xml/ws/ java/javax/xml/ws/wsaddressing/ java/org/apache/openejb/
java/org/apache/openejb/assembler/
java/org/apache/openejb/assembler/classic/ ...
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbHomeProxyHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbHomeProxyHandler.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbHomeProxyHandler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbHomeProxyHandler.java Wed Feb 19 15:47:58 2014
@@ -141,7 +141,7 @@ public abstract class EjbHomeProxyHandle
}
return ProxyManager.newProxyInstance(proxyInterfaces.toArray(new Class[proxyInterfaces.size()]), handler);
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new OpenEJBRuntimeException("Can't create EJBHome stub" + e.getMessage(), e);
}
}
@@ -178,7 +178,7 @@ public abstract class EjbHomeProxyHandle
return ProxyManager.newProxyInstance(proxyInterfaces.toArray(new Class[proxyInterfaces.size()]), handler);
}
- } catch (IllegalAccessException iae) {
+ } catch (final IllegalAccessException iae) {
throw new OpenEJBRuntimeException("Could not create IVM proxy for " + getInterfaces().get(0), iae);
}
}
@@ -245,14 +245,14 @@ public abstract class EjbHomeProxyHandle
* The ire is thrown by the container system and propagated by
* the server to the stub.
*/
- } catch (RemoteException re) {
+ } catch (final RemoteException re) {
if (interfaceType.isLocal()) {
throw new EJBException(re.getMessage()).initCause(re.detail);
} else {
throw re;
}
- } catch (InvalidateReferenceException ire) {
+ } catch (final InvalidateReferenceException ire) {
Throwable cause = ire.getRootCause();
if (cause instanceof RemoteException && interfaceType.isLocal()) {
final RemoteException re = (RemoteException) cause;
@@ -264,7 +264,7 @@ public abstract class EjbHomeProxyHandle
* Application exceptions must be reported dirctly to the client. They
* do not impact the viability of the proxy.
*/
- } catch (ApplicationException ae) {
+ } catch (final ApplicationException ae) {
final Throwable exc = ae.getRootCause() != null ? ae.getRootCause() : ae;
if (exc instanceof EJBAccessException) {
if (interfaceType.isBusiness()) {
@@ -275,7 +275,7 @@ public abstract class EjbHomeProxyHandle
} else {
try {
throw new AccessException(exc.getMessage()).initCause(exc);
- } catch (IllegalStateException vmbug) {
+ } catch (final IllegalStateException vmbug) {
// Sun JDK 1.5 bug http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4871783
// bug affects using initCause on any RemoteException subclasses in Sun 1.5_07 or lower
throw new AccessException(exc.getMessage(), (Exception) exc);
@@ -289,19 +289,19 @@ public abstract class EjbHomeProxyHandle
* A system exception would be highly unusual and would indicate a sever
* problem with the container system.
*/
- } catch (SystemException se) {
+ } catch (final SystemException se) {
if (interfaceType.isLocal()) {
throw new EJBException("Container has suffered a SystemException").initCause(se.getRootCause());
} else {
throw new RemoteException("Container has suffered a SystemException", se.getRootCause());
}
- } catch (OpenEJBException oe) {
+ } catch (final OpenEJBException oe) {
if (interfaceType.isLocal()) {
throw new EJBException("Unknown Container Exception").initCause(oe.getRootCause());
} else {
throw new RemoteException("Unknown Container Exception", oe.getRootCause());
}
- } catch (Throwable t) {
+ } catch (final Throwable t) {
logger.debug("EjbHomeProxyHandler: finished invoking method " + method.getName() + " with exception:" + t, t);
throw t;
}
@@ -352,7 +352,7 @@ public abstract class EjbHomeProxyHandle
}
try {
return homeMethodInvoke(interfce, method, args);
- } catch (ApplicationException ae) {
+ } catch (final ApplicationException ae) {
logger.error("EjbHomeProxyHandler: Asynchronous call to '" + interfce.getSimpleName() + "' on '" + method.getName() + "' failed", ae);
@@ -460,7 +460,7 @@ public abstract class EjbHomeProxyHandle
EjbObjectProxyHandler stub;
try {
stub = (EjbObjectProxyHandler) ProxyManager.getInvocationHandler(handle.getEJBObject());
- } catch (IllegalArgumentException e) {
+ } catch (final IllegalArgumentException e) {
stub = null;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectInputStream.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectInputStream.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectInputStream.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectInputStream.java Wed Feb 19 15:47:58 2014
@@ -27,15 +27,15 @@ import java.lang.reflect.Proxy;
*/
public class EjbObjectInputStream extends ObjectInputStream {
- public EjbObjectInputStream(InputStream in) throws IOException {
+ public EjbObjectInputStream(final InputStream in) throws IOException {
super(in);
}
- protected Class resolveClass(ObjectStreamClass classDesc) throws IOException, ClassNotFoundException {
+ protected Class resolveClass(final ObjectStreamClass classDesc) throws IOException, ClassNotFoundException {
try {
return Class.forName(classDesc.getName(), false, getClassloader());
- } catch (ClassNotFoundException e) {
- String n = classDesc.getName();
+ } catch (final ClassNotFoundException e) {
+ final String n = classDesc.getName();
if (n.equals("boolean")) return boolean.class;
if (n.equals("byte")) return byte.class;
if (n.equals("char")) return char.class;
@@ -49,14 +49,14 @@ public class EjbObjectInputStream extend
}
}
- protected Class resolveProxyClass(String[] interfaces) throws IOException, ClassNotFoundException {
- Class[] cinterfaces = new Class[interfaces.length];
+ protected Class resolveProxyClass(final String[] interfaces) throws IOException, ClassNotFoundException {
+ final Class[] cinterfaces = new Class[interfaces.length];
for (int i = 0; i < interfaces.length; i++)
cinterfaces[i] = getClassloader().loadClass(interfaces[i]);
try {
return Proxy.getProxyClass(getClassloader(), cinterfaces);
- } catch (IllegalArgumentException e) {
+ } catch (final IllegalArgumentException e) {
throw new ClassNotFoundException(null, e);
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java Wed Feb 19 15:47:58 2014
@@ -120,7 +120,7 @@ public abstract class EjbObjectProxyHand
* The ire is thrown by the container system and propagated by
* the server to the stub.
*/
- } catch (InvalidateReferenceException ire) {
+ } catch (final InvalidateReferenceException ire) {
invalidateAllHandlers(getRegistryId());
exc = ire.getRootCause() != null ? ire.getRootCause() : new RemoteException("InvalidateReferenceException: " + ire);
throw exc;
@@ -128,7 +128,7 @@ public abstract class EjbObjectProxyHand
* Application exceptions must be reported dirctly to the client. They
* do not impact the viability of the proxy.
*/
- } catch (ApplicationException ae) {
+ } catch (final ApplicationException ae) {
exc = ae.getRootCause() != null ? ae.getRootCause() : ae;
if (exc instanceof EJBAccessException) {
if (interfaceType.isBusiness()) {
@@ -148,12 +148,12 @@ public abstract class EjbObjectProxyHand
* A system exception would be highly unusual and would indicate a sever
* problem with the container system.
*/
- } catch (SystemException se) {
+ } catch (final SystemException se) {
invalidateReference();
exc = se.getRootCause() != null ? se.getRootCause() : se;
logger.debug("The container received an unexpected exception: ", exc);
throw new RemoteException("Container has suffered a SystemException", exc);
- } catch (OpenEJBException oe) {
+ } catch (final OpenEJBException oe) {
exc = oe.getRootCause() != null ? oe.getRootCause() : oe;
logger.debug("The container received an unexpected exception: ", exc);
throw new RemoteException("Unknown Container Exception", oe.getRootCause());
@@ -164,7 +164,7 @@ public abstract class EjbObjectProxyHand
if (null != retValue) {
try {
ret = retValue.toString();
- } catch (Exception e) {
+ } catch (final Exception e) {
ret = "toString() failed on (" + e.getMessage() + ")";
}
}
@@ -277,7 +277,7 @@ public abstract class EjbObjectProxyHand
try {
return synchronizedBusinessMethod(interfce, method, args);
- } catch (ApplicationException ae) {
+ } catch (final ApplicationException ae) {
logger.error("EjbObjectProxyHandler: Asynchronous call to '" + interfce.getSimpleName() + "' on '" + method.getName() + "' failed", ae);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmArtifact.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmArtifact.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmArtifact.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmArtifact.java Wed Feb 19 15:47:58 2014
@@ -29,11 +29,11 @@ public class IntraVmArtifact implements
private static final Handles staticHandles = new Handles() {
@Override
- public synchronized int add(Object obj) {
+ public synchronized int add(final Object obj) {
return super.add(obj);
}
@Override
- public synchronized Object get(int id) {
+ public synchronized Object get(final int id) {
return super.get(id);
}
};
@@ -50,36 +50,36 @@ public class IntraVmArtifact implements
private int instanceHandle;
private boolean staticArtifact;
- public IntraVmArtifact(Object obj) {
+ public IntraVmArtifact(final Object obj) {
this(obj, false);
}
- public IntraVmArtifact(Object obj, boolean storeStatically) {
+ public IntraVmArtifact(final Object obj, final boolean storeStatically) {
this.staticArtifact = storeStatically;
- Handles handles = getHandles(storeStatically);
+ final Handles handles = getHandles(storeStatically);
instanceHandle = handles.add(obj);
}
- private static Handles getHandles(boolean staticArtifact) {
+ private static Handles getHandles(final boolean staticArtifact) {
return staticArtifact ? staticHandles : threadHandles.get();
}
public IntraVmArtifact() {
}
- public void writeExternal(ObjectOutput out) throws IOException {
+ public void writeExternal(final ObjectOutput out) throws IOException {
out.writeBoolean(staticArtifact);
out.write(instanceHandle);
}
- public void readExternal(ObjectInput in) throws IOException {
+ public void readExternal(final ObjectInput in) throws IOException {
staticArtifact = in.readBoolean();
instanceHandle = in.read();
}
protected Object readResolve() throws ObjectStreamException {
- Handles handles = getHandles(staticArtifact);
- Object artifact = handles.get(instanceHandle);
+ final Handles handles = getHandles(staticArtifact);
+ final Object artifact = handles.get(instanceHandle);
if (artifact == null) throw new InvalidObjectException(NO_ARTIFACT_ERROR + instanceHandle);
return artifact;
}
@@ -87,14 +87,14 @@ public class IntraVmArtifact implements
private static class Handles {
private List<Object> list = new ArrayList<Object>();
- public int add(Object obj) {
- int id = list.size();
+ public int add(final Object obj) {
+ final int id = list.size();
list.add(obj);
return id;
}
- public Object get(int id) {
- Object obj = list.get(id);
+ public Object get(final int id) {
+ final Object obj = list.get(id);
// todo WHY?
if (list.size() == id + 1) {
list.clear();
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmCopyMonitor.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmCopyMonitor.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmCopyMonitor.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmCopyMonitor.java Wed Feb 19 15:47:58 2014
@@ -26,7 +26,7 @@ public final class IntraVmCopyMonitor {
this.copy = false;
}
- State(boolean copy) {
+ State(final boolean copy) {
this.copy = copy;
}
@@ -59,7 +59,7 @@ public final class IntraVmCopyMonitor {
return monitor;
}
- public static void pre(State state){
+ public static void pre(final State state){
getMonitor().state = state;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmHandle.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmHandle.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmHandle.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmHandle.java Wed Feb 19 15:47:58 2014
@@ -31,7 +31,7 @@ import java.io.Serializable;
public class IntraVmHandle implements Serializable, HomeHandle, Handle {
protected Object theProxy;
- public IntraVmHandle(Object proxy) {
+ public IntraVmHandle(final Object proxy) {
this.theProxy = proxy;
}
@@ -71,12 +71,12 @@ public class IntraVmHandle implements Se
* allow the application server to handle it.
*/
} else {
- BaseEjbProxyHandler handler = (BaseEjbProxyHandler) ProxyManager.getInvocationHandler(theProxy);
+ final BaseEjbProxyHandler handler = (BaseEjbProxyHandler) ProxyManager.getInvocationHandler(theProxy);
if (theProxy instanceof EJBObject) {
- ApplicationServer applicationServer = ServerFederation.getApplicationServer();
+ final ApplicationServer applicationServer = ServerFederation.getApplicationServer();
return applicationServer.getHandle(handler.getProxyInfo());
} else if (theProxy instanceof EJBHome) {
- ApplicationServer applicationServer = ServerFederation.getApplicationServer();
+ final ApplicationServer applicationServer = ServerFederation.getApplicationServer();
return applicationServer.getHomeHandle(handler.getProxyInfo());
} else {
throw new OpenEJBRuntimeException("Invalid proxy type. Handles are only supported by EJBObject types in EJB 1.1");
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmMetaData.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmMetaData.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmMetaData.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmMetaData.java Wed Feb 19 15:47:58 2014
@@ -38,11 +38,11 @@ public class IntraVmMetaData implements
protected BeanType type;
- public IntraVmMetaData(Class homeInterface, Class remoteInterface, BeanType typeOfBean) {
+ public IntraVmMetaData(final Class homeInterface, final Class remoteInterface, final BeanType typeOfBean) {
this(homeInterface, remoteInterface, null, typeOfBean);
}
- public IntraVmMetaData(Class homeInterface, Class remoteInterface, Class primaryKeyClass, BeanType typeOfBean) {
+ public IntraVmMetaData(final Class homeInterface, final Class remoteInterface, final Class primaryKeyClass, final BeanType typeOfBean) {
this.type = typeOfBean;
if (homeInterface == null || remoteInterface == null) {
throw new IllegalArgumentException();
@@ -91,7 +91,7 @@ public class IntraVmMetaData implements
return type == BeanType.STATEFUL;
}
- public void setEJBHome(EJBHome home) {
+ public void setEJBHome(final EJBHome home) {
homeStub = home;
}
@@ -124,8 +124,8 @@ public class IntraVmMetaData implements
* we allow the application server to handle it.
*/
} else {
- BaseEjbProxyHandler handler = (BaseEjbProxyHandler) ProxyManager.getInvocationHandler(homeStub);
- ApplicationServer applicationServer = ServerFederation.getApplicationServer();
+ final BaseEjbProxyHandler handler = (BaseEjbProxyHandler) ProxyManager.getInvocationHandler(homeStub);
+ final ApplicationServer applicationServer = ServerFederation.getApplicationServer();
return applicationServer.getEJBMetaData(handler.getProxyInfo());
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmServer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmServer.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmServer.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmServer.java Wed Feb 19 15:47:58 2014
@@ -28,31 +28,31 @@ import javax.ejb.HomeHandle;
public class IntraVmServer implements ApplicationServer {
- public EJBMetaData getEJBMetaData(ProxyInfo pi) {
- BeanContext beanContext = pi.getBeanContext();
- IntraVmMetaData metaData = new IntraVmMetaData(beanContext.getHomeInterface(), beanContext.getRemoteInterface(), beanContext.getComponentType());
+ public EJBMetaData getEJBMetaData(final ProxyInfo pi) {
+ final BeanContext beanContext = pi.getBeanContext();
+ final IntraVmMetaData metaData = new IntraVmMetaData(beanContext.getHomeInterface(), beanContext.getRemoteInterface(), beanContext.getComponentType());
metaData.setEJBHome(getEJBHome(pi));
return metaData;
}
- public Handle getHandle(ProxyInfo pi) {
+ public Handle getHandle(final ProxyInfo pi) {
return new IntraVmHandle(getEJBObject(pi));
}
- public HomeHandle getHomeHandle(ProxyInfo pi) {
+ public HomeHandle getHomeHandle(final ProxyInfo pi) {
return new IntraVmHandle(getEJBHome(pi));
}
- public EJBObject getEJBObject(ProxyInfo pi) {
+ public EJBObject getEJBObject(final ProxyInfo pi) {
return (EJBObject) EjbObjectProxyHandler.createProxy(pi.getBeanContext(), pi.getPrimaryKey(), pi.getInterfaceType(), pi.getInterfaces(), pi.getInterface());
}
- public Object getBusinessObject(ProxyInfo pi) {
+ public Object getBusinessObject(final ProxyInfo pi) {
return EjbObjectProxyHandler.createProxy(pi.getBeanContext(), pi.getPrimaryKey(), pi.getInterfaceType(), pi.getInterfaces(), pi.getInterface());
}
- public EJBHome getEJBHome(ProxyInfo pi) {
+ public EJBHome getEJBHome(final ProxyInfo pi) {
return (EJBHome) EjbHomeProxyHandler.createHomeProxy(pi.getBeanContext(), pi.getInterfaceType());
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/AbstractThreadLocalProxy.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/AbstractThreadLocalProxy.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/AbstractThreadLocalProxy.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/AbstractThreadLocalProxy.java Wed Feb 19 15:47:58 2014
@@ -36,7 +36,7 @@ public class AbstractThreadLocalProxy<T>
infos.remove();
}
- public void set(T value) {
+ public void set(final T value) {
infos.set(value);
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/BusinessLocalBeanReference.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/BusinessLocalBeanReference.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/BusinessLocalBeanReference.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/BusinessLocalBeanReference.java Wed Feb 19 15:47:58 2014
@@ -27,7 +27,7 @@ public class BusinessLocalBeanReference
private final BeanContext.BusinessLocalBeanHome businessHome;
- public BusinessLocalBeanReference(BeanContext.BusinessLocalBeanHome localBeanHome) {
+ public BusinessLocalBeanReference(final BeanContext.BusinessLocalBeanHome localBeanHome) {
this.businessHome = localBeanHome;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/BusinessLocalReference.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/BusinessLocalReference.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/BusinessLocalReference.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/BusinessLocalReference.java Wed Feb 19 15:47:58 2014
@@ -27,7 +27,7 @@ public class BusinessLocalReference exte
private final BeanContext.BusinessLocalHome businessHome;
- public BusinessLocalReference(BeanContext.BusinessLocalHome businessHome) {
+ public BusinessLocalReference(final BeanContext.BusinessLocalHome businessHome) {
this.businessHome = businessHome;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/BusinessRemoteReference.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/BusinessRemoteReference.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/BusinessRemoteReference.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/BusinessRemoteReference.java Wed Feb 19 15:47:58 2014
@@ -27,7 +27,7 @@ public class BusinessRemoteReference ext
private final BeanContext.BusinessRemoteHome businessHome;
- public BusinessRemoteReference(BeanContext.BusinessRemoteHome businessHome) {
+ public BusinessRemoteReference(final BeanContext.BusinessRemoteHome businessHome) {
this.businessHome = businessHome;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/ClassReference.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/ClassReference.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/ClassReference.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/ClassReference.java Wed Feb 19 15:47:58 2014
@@ -22,15 +22,15 @@ public class ClassReference extends Refe
private final String className;
- public ClassReference(String className) {
+ public ClassReference(final String className) {
this.className = className;
}
public Object getObject() throws NamingException {
- ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+ final ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
try {
return classLoader.loadClass(className);
- } catch (ClassNotFoundException e) {
+ } catch (final ClassNotFoundException e) {
throw new NamingException("Erorr loading class: " + className);
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/ContextualJndiReference.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/ContextualJndiReference.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/ContextualJndiReference.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/ContextualJndiReference.java Wed Feb 19 15:47:58 2014
@@ -120,7 +120,7 @@ public class ContextualJndiReference ext
if (appContext.getClassLoader().equals(loader)) {
return appContext.getId();
}
- for (WebContext web : appContext.getWebContexts()) {
+ for (final WebContext web : appContext.getWebContexts()) {
if (web.getClassLoader().equals(loader)) {
return appContext.getId();
}
@@ -143,9 +143,9 @@ public class ContextualJndiReference ext
} else {
return jndiContext.lookup("openejb/Resource/" + s);
}
- } catch (NameNotFoundException e) {
+ } catch (final NameNotFoundException e) {
return jndiContext.lookup("java:module/" + Strings.lastPart(getClassName(), '.'));
- } catch (NamingException e) {
+ } catch (final NamingException e) {
throw (NamingException)new NamingException("could not look up " + s).initCause(e);
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/CrossClassLoaderJndiReference.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/CrossClassLoaderJndiReference.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/CrossClassLoaderJndiReference.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/CrossClassLoaderJndiReference.java Wed Feb 19 15:47:58 2014
@@ -25,7 +25,7 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
public class CrossClassLoaderJndiReference extends IntraVmJndiReference {
- public CrossClassLoaderJndiReference(String jndiName) {
+ public CrossClassLoaderJndiReference(final String jndiName) {
super(jndiName);
}
@@ -33,22 +33,22 @@ public class CrossClassLoaderJndiReferen
Object o = super.getObject();
try {
o = copy(o);
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new NamingException("Error copying object into local class loader", e);
}
return o;
}
- private static Object copy(Object source) throws Exception {
+ private static Object copy(final Object source) throws Exception {
IntraVmCopyMonitor.preCrossClassLoaderOperation();
try {
- ByteArrayOutputStream baos = new ByteArrayOutputStream(4096);
- ObjectOutputStream out = new ObjectOutputStream(baos);
+ final ByteArrayOutputStream baos = new ByteArrayOutputStream(4096);
+ final ObjectOutputStream out = new ObjectOutputStream(baos);
out.writeObject(source);
out.close();
- ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
- ObjectInputStream in = new EjbObjectInputStream(bais);
+ final ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+ final ObjectInputStream in = new EjbObjectInputStream(bais);
return in.readObject();
} finally {
IntraVmCopyMonitor.postCrossClassLoaderOperation();
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/InitContextFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/InitContextFactory.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/InitContextFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/InitContextFactory.java Wed Feb 19 15:47:58 2014
@@ -57,7 +57,7 @@ public class InitContextFactory implemen
identity = securityService.login(realmName, user, pass);
}
securityService.associate(identity);
- } catch (LoginException e) {
+ } catch (final LoginException e) {
throw (AuthenticationException) new AuthenticationException("User could not be authenticated: " + user).initCause(e);
}
}
@@ -89,9 +89,9 @@ public class InitContextFactory implemen
OpenEJB.init(props);
- } catch (OpenEJBException e) {
+ } catch (final OpenEJBException e) {
throw new NamingException("Cannot initailize OpenEJB", e);
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new NamingException("Cannot initailize OpenEJB", e);
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IntraVmJndiReference.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IntraVmJndiReference.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IntraVmJndiReference.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IntraVmJndiReference.java Wed Feb 19 15:47:58 2014
@@ -27,7 +27,7 @@ public class IntraVmJndiReference extend
private String jndiName;
- public IntraVmJndiReference(String jndiName) {
+ public IntraVmJndiReference(final String jndiName) {
this.jndiName = jndiName;
}
@@ -36,12 +36,12 @@ public class IntraVmJndiReference extend
}
public Object getObject() throws NamingException {
- ContainerSystem containerSystem = SystemInstance.get().getComponent(ContainerSystem.class);
+ final ContainerSystem containerSystem = SystemInstance.get().getComponent(ContainerSystem.class);
try {
return containerSystem.getJNDIContext().lookup(jndiName);
- } catch (NameNotFoundException e) { // EE.5.18: try using java:module/<shortName> prefix
+ } catch (final NameNotFoundException e) { // EE.5.18: try using java:module/<shortName> prefix
return containerSystem.getJNDIContext().lookup("java:module/" + Strings.lastPart(getClassName(), '.'));
- } catch (NamingException e) {
+ } catch (final NamingException e) {
throw (NamingException)new NamingException("could not look up " + jndiName).initCause(e);
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java Wed Feb 19 15:47:58 2014
@@ -80,16 +80,16 @@ public class IvmContext implements Conte
this(new NameNode(null, new ParsedName(""), null, null));
}
- public IvmContext(String nodeName) {
+ public IvmContext(final String nodeName) {
this(new NameNode(null, new ParsedName(nodeName), null, null));
}
- public IvmContext(NameNode node) {
+ public IvmContext(final NameNode node) {
mynode = node;
// mynode.setMyContext(this);
}
- public IvmContext(Hashtable<String, Object> environment) throws NamingException {
+ public IvmContext(final Hashtable<String, Object> environment) throws NamingException {
this();
if (environment == null)
throw new NamingException("Invalid Argument");
@@ -98,19 +98,19 @@ public class IvmContext implements Conte
}
- public Object lookup(String compositName) throws NamingException {
+ public Object lookup(final String compositName) throws NamingException {
if (compositName.equals("")) {
return this;
}
- String compoundName;
- int index = compositName.indexOf(":");
+ final String compoundName;
+ final int index = compositName.indexOf(":");
if (index > -1) {
- String prefix = compositName.substring(0, index);
+ final String prefix = compositName.substring(0, index);
String path = compositName.substring(index + 1);
- ParsedName name = new ParsedName(path);
+ final ParsedName name = new ParsedName(path);
if (prefix.equals("openejb")){
path = name.path();
@@ -145,7 +145,7 @@ public class IvmContext implements Conte
if (obj == null) {
try {
obj = mynode.resolve(new ParsedName(compoundName));
- } catch (NameNotFoundException nnfe) {
+ } catch (final NameNotFoundException nnfe) {
obj = federate(compositName);
}
@@ -177,18 +177,18 @@ public class IvmContext implements Conte
return obj;
}
- protected Object federate(String compositName) throws NamingException {
- ObjectFactory[] factories = getFederatedFactories();
- for (ObjectFactory factory : factories) {
+ protected Object federate(final String compositName) throws NamingException {
+ final ObjectFactory[] factories = getFederatedFactories();
+ for (final ObjectFactory factory : factories) {
try {
- CompositeName name = new CompositeName(compositName);
- Object obj = factory.getObjectInstance(null, name, null, null);
+ final CompositeName name = new CompositeName(compositName);
+ final Object obj = factory.getObjectInstance(null, name, null, null);
if (obj instanceof Context)
return ((Context) obj).lookup(compositName);
else if (obj != null)
return obj;
- } catch (Exception doNothing) {
+ } catch (final Exception doNothing) {
// no-op
}
}
@@ -200,31 +200,31 @@ public class IvmContext implements Conte
public static ObjectFactory [] getFederatedFactories() throws NamingException {
if (federatedFactories == null) {
- Set<ObjectFactory> factories = new HashSet<ObjectFactory>();
- String urlPackagePrefixes = getUrlPackagePrefixes();
+ final Set<ObjectFactory> factories = new HashSet<ObjectFactory>();
+ final String urlPackagePrefixes = getUrlPackagePrefixes();
if (urlPackagePrefixes == null) {
return new ObjectFactory[0];
}
- for (StringTokenizer tokenizer = new StringTokenizer(urlPackagePrefixes, ":"); tokenizer.hasMoreTokens();) {
- String urlPackagePrefix = tokenizer.nextToken();
- String className = urlPackagePrefix + ".java.javaURLContextFactory";
+ for (final StringTokenizer tokenizer = new StringTokenizer(urlPackagePrefixes, ":"); tokenizer.hasMoreTokens();) {
+ final String urlPackagePrefix = tokenizer.nextToken();
+ final String className = urlPackagePrefix + ".java.javaURLContextFactory";
if (className.equals("org.apache.openejb.core.ivm.naming.java.javaURLContextFactory"))
continue;
try {
- ClassLoader cl = ClassLoaderUtil.getContextClassLoader();
- Class factoryClass = Class.forName(className, true, cl);
- ObjectFactory factoryInstance = (ObjectFactory) factoryClass.newInstance();
+ final ClassLoader cl = ClassLoaderUtil.getContextClassLoader();
+ final Class factoryClass = Class.forName(className, true, cl);
+ final ObjectFactory factoryInstance = (ObjectFactory) factoryClass.newInstance();
factories.add(factoryInstance);
- } catch (ClassNotFoundException cnfe) {
+ } catch (final ClassNotFoundException cnfe) {
// no-op
- } catch (Throwable e) {
- NamingException ne = new NamingException("Federation failed: Cannot instantiate " + className);
+ } catch (final Throwable e) {
+ final NamingException ne = new NamingException("Federation failed: Cannot instantiate " + className);
ne.setRootCause(e);
throw ne;
}
}
- Object [] temp = factories.toArray();
+ final Object [] temp = factories.toArray();
federatedFactories = new ObjectFactory[temp.length];
System.arraycopy(temp, 0, federatedFactories, 0, federatedFactories.length);
}
@@ -241,27 +241,27 @@ public class IvmContext implements Conte
if (classLoader == null) classLoader = ClassLoader.getSystemClassLoader();
try {
- Enumeration<URL> resources = classLoader.getResources("jndi.properties");
+ final Enumeration<URL> resources = classLoader.getResources("jndi.properties");
while (urlPackagePrefixes == null && resources.hasMoreElements()) {
- URL resource = resources.nextElement();
- InputStream in = IO.read(resource);
+ final URL resource = resources.nextElement();
+ final InputStream in = IO.read(resource);
urlPackagePrefixes = getUrlPackagePrefixes(in);
}
- } catch (IOException ignored) {
+ } catch (final IOException ignored) {
// no-op
}
}
// 3. ${java.home}/lib/jndi.properties
if (urlPackagePrefixes == null) {
- String javahome = System.getProperty("java.home");
+ final String javahome = System.getProperty("java.home");
if (javahome != null) {
InputStream in = null;
try {
- File propertiesFile = new File(new File(javahome, "lib"), "jndi.properties");
+ final File propertiesFile = new File(new File(javahome, "lib"), "jndi.properties");
in = IO.read(propertiesFile);
urlPackagePrefixes = getUrlPackagePrefixes(in);
- } catch (FileNotFoundException ignored) {
+ } catch (final FileNotFoundException ignored) {
// no-op
} finally {
IO.close(in);
@@ -272,22 +272,22 @@ public class IvmContext implements Conte
return urlPackagePrefixes;
}
- private static String getUrlPackagePrefixes(InputStream in) {
+ private static String getUrlPackagePrefixes(final InputStream in) {
try {
final Properties properties = IO.readProperties(in, new Properties());
return properties.getProperty(Context.URL_PKG_PREFIXES);
- } catch (IOException e) {
+ } catch (final IOException e) {
return null;
}
}
- public Object lookup(Name compositName) throws NamingException {
+ public Object lookup(final Name compositName) throws NamingException {
return lookup(compositName.toString());
}
- public void bind(String name, Object obj) throws NamingException {
+ public void bind(String name, final Object obj) throws NamingException {
checkReadOnly();
- int indx = name.indexOf(":");
+ final int indx = name.indexOf(":");
if (indx > -1) {
/*
The ':' character will be in the path if its an absolute path name starting with the schema
@@ -298,31 +298,31 @@ public class IvmContext implements Conte
if (fastCache.containsKey(name))
throw new NameAlreadyBoundException();
else {
- ParsedName parsedName = new ParsedName(name);
+ final ParsedName parsedName = new ParsedName(name);
mynode.bind(parsedName, obj);
}
}
- public void bind(Name name, Object obj) throws NamingException {
+ public void bind(final Name name, final Object obj) throws NamingException {
bind(name.toString(), obj);
}
- public void rebind(String name, Object obj) throws NamingException {
+ public void rebind(final String name, final Object obj) throws NamingException {
try {
unbind(name);
- } catch (NameNotFoundException e) {
+ } catch (final NameNotFoundException e) {
// no-op
}
bind(name, obj);
}
- public void rebind(Name name, Object obj) throws NamingException {
+ public void rebind(final Name name, final Object obj) throws NamingException {
rebind(name.toString(), obj);
}
public void unbind(String name) throws NamingException {
checkReadOnly();
- int indx = name.indexOf(":");
+ final int indx = name.indexOf(":");
if (indx > -1) {
/*
The ':' character will be in the path if its an absolute path name starting with the schema
@@ -336,12 +336,12 @@ public class IvmContext implements Conte
mynode.unbind(new ParsedName(name));
}
- public void unbind(Name name) throws NamingException {
+ public void unbind(final Name name) throws NamingException {
unbind(name.toString());
}
- public void prune(String name) throws NamingException {
- IvmContext ctx = (IvmContext) lookup(name);
+ public void prune(final String name) throws NamingException {
+ final IvmContext ctx = (IvmContext) lookup(name);
ctx.prune();
}
@@ -349,16 +349,16 @@ public class IvmContext implements Conte
mynode.prune();
}
- public void rename(String oldname, String newname) throws NamingException {
+ public void rename(final String oldname, final String newname) throws NamingException {
throw new OperationNotSupportedException();
}
- public void rename(Name oldname, Name newname) throws NamingException {
+ public void rename(final Name oldname, final Name newname) throws NamingException {
rename(oldname.toString(), newname.toString());
}
- public NamingEnumeration<NameClassPair> list(String name) throws NamingException {
- Object obj = lookup(name);
+ public NamingEnumeration<NameClassPair> list(final String name) throws NamingException {
+ final Object obj = lookup(name);
if (obj.getClass() == IvmContext.class)
return new MyListEnumeration(((IvmContext) obj).mynode);
else {
@@ -366,12 +366,12 @@ public class IvmContext implements Conte
}
}
- public NamingEnumeration<NameClassPair> list(Name name) throws NamingException {
+ public NamingEnumeration<NameClassPair> list(final Name name) throws NamingException {
return list(name.toString());
}
- public NamingEnumeration<Binding> listBindings(String name) throws NamingException {
- Object obj = lookup(name);
+ public NamingEnumeration<Binding> listBindings(final String name) throws NamingException {
+ final Object obj = lookup(name);
if (obj.getClass() == IvmContext.class)
return new MyBindingEnumeration(((IvmContext) obj).mynode);
else {
@@ -379,21 +379,21 @@ public class IvmContext implements Conte
}
}
- public NamingEnumeration<Binding> listBindings(Name name) throws NamingException {
+ public NamingEnumeration<Binding> listBindings(final Name name) throws NamingException {
return listBindings(name.toString());
}
- public void destroySubcontext(String name) throws NamingException {
+ public void destroySubcontext(final String name) throws NamingException {
throw new OperationNotSupportedException();
}
- public void destroySubcontext(Name name) throws NamingException {
+ public void destroySubcontext(final Name name) throws NamingException {
destroySubcontext(name.toString());
}
public Context createSubcontext(String name) throws NamingException {
checkReadOnly();
- int indx = name.indexOf(":");
+ final int indx = name.indexOf(":");
if (indx > -1) {
/*
The ':' character will be in the path if its an absolute path name starting with the schema
@@ -407,46 +407,46 @@ public class IvmContext implements Conte
return mynode.createSubcontext(new ParsedName(name));
}
- public Context createSubcontext(Name name) throws NamingException {
+ public Context createSubcontext(final Name name) throws NamingException {
return createSubcontext(name.toString());
}
- public Object lookupLink(String name) throws NamingException {
+ public Object lookupLink(final String name) throws NamingException {
return lookup(name);
}
- public Object lookupLink(Name name) throws NamingException {
+ public Object lookupLink(final Name name) throws NamingException {
return lookupLink(name.toString());
}
- public NameParser getNameParser(String name) throws NamingException {
+ public NameParser getNameParser(final String name) throws NamingException {
return ContextUtil.NAME_PARSER;
}
- public NameParser getNameParser(Name name) throws NamingException {
+ public NameParser getNameParser(final Name name) throws NamingException {
return getNameParser(name.toString());
}
- public String composeName(String name, String prefix) throws NamingException {
- Name result = composeName(new CompositeName(name),
+ public String composeName(final String name, final String prefix) throws NamingException {
+ final Name result = composeName(new CompositeName(name),
new CompositeName(prefix));
return result.toString();
}
- public Name composeName(Name name, Name prefix) throws NamingException {
- Name result = (Name) prefix.clone();
+ public Name composeName(final Name name, final Name prefix) throws NamingException {
+ final Name result = (Name) prefix.clone();
result.addAll(name);
return result;
}
- public Object addToEnvironment(String propName, Object propVal) throws NamingException {
+ public Object addToEnvironment(final String propName, final Object propVal) throws NamingException {
if (myEnv == null) {
myEnv = new Hashtable<String, Object>(5);
}
return myEnv.put(propName, propVal);
}
- public Object removeFromEnvironment(String propName) throws NamingException {
+ public Object removeFromEnvironment(final String propName) throws NamingException {
if (myEnv == null)
return null;
return myEnv.remove(propName);
@@ -474,14 +474,14 @@ public class IvmContext implements Conte
protected class MyBindingEnumeration extends MyNamingEnumeration {
- public MyBindingEnumeration(NameNode parentNode) {
+ public MyBindingEnumeration(final NameNode parentNode) {
super(parentNode);
}
- protected void buildEnumeration(Vector vect) {
+ protected void buildEnumeration(final Vector vect) {
for (int i = 0; i < vect.size(); i++) {
- NameNode node = (NameNode) vect.elementAt(i);
- String className = node.getBinding().getClass().getName();
+ final NameNode node = (NameNode) vect.elementAt(i);
+ final String className = node.getBinding().getClass().getName();
vect.setElementAt(new Binding(node.getAtomicName(), className, node.getBinding()), i);
}
myEnum = vect.elements();
@@ -491,14 +491,14 @@ public class IvmContext implements Conte
protected class MyListEnumeration extends MyNamingEnumeration {
- public MyListEnumeration(NameNode parentNode) {
+ public MyListEnumeration(final NameNode parentNode) {
super(parentNode);
}
- protected void buildEnumeration(Vector vect) {
+ protected void buildEnumeration(final Vector vect) {
for (int i = 0; i < vect.size(); i++) {
- NameNode node = (NameNode) vect.elementAt(i);
- String className = node.getBinding().getClass().getName();
+ final NameNode node = (NameNode) vect.elementAt(i);
+ final String className = node.getBinding().getClass().getName();
vect.setElementAt(new NameClassPair(node.getAtomicName(), className), i);
}
myEnum = vect.elements();
@@ -510,8 +510,8 @@ public class IvmContext implements Conte
Enumeration myEnum;
- public MyNamingEnumeration(NameNode parentNode) {
- Vector vect = new Vector();
+ public MyNamingEnumeration(final NameNode parentNode) {
+ final Vector vect = new Vector();
NameNode node = parentNode.getSubTree();
@@ -528,7 +528,7 @@ public class IvmContext implements Conte
protected abstract void buildEnumeration(Vector<NameNode> vect);
- protected void gatherNodes(NameNode node, Vector vect) {
+ protected void gatherNodes(final NameNode node, final Vector vect) {
if (node.getLessTree() != null) {
vect.addElement(node.getLessTree());
gatherNodes(node.getLessTree(), vect);
@@ -560,7 +560,7 @@ public class IvmContext implements Conte
}
}
- public void tree(PrintStream out){
+ public void tree(final PrintStream out){
mynode.tree("", out);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmJndiFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmJndiFactory.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmJndiFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmJndiFactory.java Wed Feb 19 15:47:58 2014
@@ -40,26 +40,26 @@ public class IvmJndiFactory implements J
jndiRootContext.bind("openejb/client/.", "");
jndiRootContext.bind("openejb/Deployment/.", "");
jndiRootContext.bind("openejb/global/.", "");
- } catch (NamingException e) {
+ } catch (final NamingException e) {
throw new OpenEJBRuntimeException("this should not happen", e);
}
}
- public Context createComponentContext(Map<String, Object> bindings) throws SystemException {
- IvmContext context = new IvmContext();
+ public Context createComponentContext(final Map<String, Object> bindings) throws SystemException {
+ final IvmContext context = new IvmContext();
try {
context.bind("java:comp/env/dummy", "dummy");
- } catch (NamingException e) {
+ } catch (final NamingException e) {
throw new SystemException("Unable to create subcontext 'java:comp/env'. Exception:"+e.getMessage(),e);
}
- for (Map.Entry<String, Object> entry: bindings.entrySet()) {
- String name = entry.getKey();
- Object value = entry.getValue();
+ for (final Map.Entry<String, Object> entry: bindings.entrySet()) {
+ final String name = entry.getKey();
+ final Object value = entry.getValue();
if (value == null) continue;
try {
context.bind(name, value);
- } catch (NamingException e) {
+ } catch (final NamingException e) {
throw new SystemException("Unable to bind '" + name + "' into bean's enc.", e);
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JaxWsServiceReference.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JaxWsServiceReference.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JaxWsServiceReference.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JaxWsServiceReference.java Wed Feb 19 15:47:58 2014
@@ -53,7 +53,7 @@ public class JaxWsServiceReference exten
private PortAddressRegistry portAddressRegistry;
private final List<PortRefData> portRefs = new ArrayList<PortRefData>();
- public JaxWsServiceReference(String id, QName serviceQName, Class<? extends Service> serviceClass, QName portQName, Class<?> referenceClass, URL wsdlUrl, List<PortRefData> portRefs, List<HandlerChainData> handlerChains, Collection<Injection> injections) {
+ public JaxWsServiceReference(final String id, final QName serviceQName, final Class<? extends Service> serviceClass, final QName portQName, final Class<?> referenceClass, final URL wsdlUrl, final List<PortRefData> portRefs, final List<HandlerChainData> handlerChains, final Collection<Injection> injections) {
this.id = id;
this.serviceQName = serviceQName;
this.serviceClass = serviceClass;
@@ -70,27 +70,27 @@ public class JaxWsServiceReference exten
}
public Object getObject() throws NamingException {
- String referenceClassName = referenceClass != null ? referenceClass.getName() : null;
- Set<PortAddress> portAddresses = getPortAddressRegistry().getPorts(id, serviceQName, referenceClassName);
+ final String referenceClassName = referenceClass != null ? referenceClass.getName() : null;
+ final Set<PortAddress> portAddresses = getPortAddressRegistry().getPorts(id, serviceQName, referenceClassName);
// if we only have one address, use that address for the wsdl and the serviceQName
URL wsdlUrl = this.wsdlUrl;
QName serviceQName = this.serviceQName;
if (portAddresses.size() == 1) {
- PortAddress portAddress = portAddresses.iterator().next();
+ final PortAddress portAddress = portAddresses.iterator().next();
try {
wsdlUrl = new URL(portAddress.getAddress() + "?wsdl");
- } catch (MalformedURLException e) {
+ } catch (final MalformedURLException e) {
// no-op
}
serviceQName = portAddress.getServiceQName();
}
// add the port addresses to the portRefData
- Map<QName,PortRefData> portsByQName = new HashMap<QName,PortRefData>();
- List<PortRefData> ports = new ArrayList<PortRefData>(portRefs.size() + portAddresses.size());
- for (PortRefData portRef : portRefs) {
- PortRefData port = new PortRefData(portRef);
+ final Map<QName,PortRefData> portsByQName = new HashMap<QName,PortRefData>();
+ final List<PortRefData> ports = new ArrayList<PortRefData>(portRefs.size() + portAddresses.size());
+ for (final PortRefData portRef : portRefs) {
+ final PortRefData port = new PortRefData(portRef);
if (port.getQName() != null) {
portsByQName.put(port.getQName(), port);
}
@@ -98,7 +98,7 @@ public class JaxWsServiceReference exten
}
// add PortRefData for any portAddress not added above
- for (PortAddress portAddress : portAddresses) {
+ for (final PortAddress portAddress : portAddresses) {
PortRefData port = portsByQName.get(portAddress.getPortQName());
if (port == null) {
port = new PortRefData();
@@ -123,7 +123,7 @@ public class JaxWsServiceReference exten
} else {
try {
instance = serviceClass.getConstructor(URL.class, QName.class).newInstance(wsdlUrl, serviceQName);
- } catch (Throwable e) {
+ } catch (final Throwable e) {
throw (NamingException) new NamingException("Could not instantiate jax-ws service class " + serviceClass.getName()).initCause(e);
}
}
@@ -132,11 +132,11 @@ public class JaxWsServiceReference exten
}
if (!handlerChains.isEmpty()) {
- HandlerResolver handlerResolver = new HandlerResolverImpl(handlerChains, injections, new InitialContext());
+ final HandlerResolver handlerResolver = new HandlerResolverImpl(handlerChains, injections, new InitialContext());
instance.setHandlerResolver(handlerResolver);
}
- Object port;
+ final Object port;
if (referenceClass != null && !Service.class.isAssignableFrom(referenceClass)) {
// do port lookup
port = instance.getPort(referenceClass);
@@ -146,7 +146,7 @@ public class JaxWsServiceReference exten
}
// register the service data so it can be fetched when the service is passed over the EJBd protocol
- ServiceRefData serviceRefData = new ServiceRefData(id,
+ final ServiceRefData serviceRefData = new ServiceRefData(id,
serviceQName,
serviceClass, portQName,
referenceClass,
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiEncArtifact.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiEncArtifact.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiEncArtifact.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiEncArtifact.java Wed Feb 19 15:47:58 2014
@@ -38,7 +38,7 @@ import java.io.Serializable;
public class JndiEncArtifact implements Serializable {
String path = new String();
- public JndiEncArtifact(IvmContext context) {
+ public JndiEncArtifact(final IvmContext context) {
NameNode node = context.mynode;
do {
path = node.getAtomicName() + "/" + path;
@@ -47,15 +47,15 @@ public class JndiEncArtifact implements
}
public Object readResolve() throws ObjectStreamException {
- ThreadContext thrdCntx = ThreadContext.getThreadContext();
- BeanContext deployment = thrdCntx.getBeanContext();
- Context cntx = deployment.getJndiEnc();
+ final ThreadContext thrdCntx = ThreadContext.getThreadContext();
+ final BeanContext deployment = thrdCntx.getBeanContext();
+ final Context cntx = deployment.getJndiEnc();
try {
- Object obj = cntx.lookup(path);
+ final Object obj = cntx.lookup(path);
if (obj == null)
throw new InvalidObjectException("JNDI ENC context reference could not be properly resolved when bean instance was activated");
return obj;
- } catch (NamingException e) {
+ } catch (final NamingException e) {
throw (InvalidObjectException)new InvalidObjectException("JNDI ENC context reference could not be properly resolved due to a JNDI exception, when bean instance was activated").initCause(e);
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiReference.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiReference.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiReference.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiReference.java Wed Feb 19 15:47:58 2014
@@ -36,19 +36,19 @@ public class JndiReference extends Refer
* some other JNDI name space. The context is provided and the lookup name, but the
* object is not resolved until it's requested.
*/
- public JndiReference(Context linkedContext, String jndiName) {
+ public JndiReference(final Context linkedContext, final String jndiName) {
this.context = linkedContext;
this.jndiName = jndiName;
}
/*
*/
- public JndiReference(String contextJndiName, String jndiName) {
+ public JndiReference(final String contextJndiName, final String jndiName) {
this.contextJndiName = contextJndiName;
this.jndiName = jndiName;
}
- public JndiReference(Hashtable envProperties, String jndiName) {
+ public JndiReference(final Hashtable envProperties, final String jndiName) {
if (envProperties == null || envProperties.size() == 0) {
this.envProperties = null;
} else {
@@ -58,7 +58,7 @@ public class JndiReference extends Refer
}
public Object getObject() throws NamingException {
- Context externalContext = getContext();
+ final Context externalContext = getContext();
synchronized (externalContext) {
/* According to the JNDI SPI specification multiple threads may not access the same JNDI
Context *instance* concurrently. Since we don't know the origines of the federated context we must
@@ -71,7 +71,7 @@ public class JndiReference extends Refer
protected Context getContext() throws NamingException {
if (context == null) {
if (contextJndiName != null) {
- ContainerSystem containerSystem = SystemInstance.get().getComponent(ContainerSystem.class);
+ final ContainerSystem containerSystem = SystemInstance.get().getComponent(ContainerSystem.class);
context = (Context) containerSystem.getJNDIContext().lookup(contextJndiName);
} else {
context = new InitialContext(envProperties);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiUrlReference.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiUrlReference.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiUrlReference.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiUrlReference.java Wed Feb 19 15:47:58 2014
@@ -22,7 +22,7 @@ import javax.naming.NamingException;
public class JndiUrlReference extends Reference {
private String jndiName;
- public JndiUrlReference(String jndiName) {
+ public JndiUrlReference(final String jndiName) {
this.jndiName = jndiName;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NameNode.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NameNode.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NameNode.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NameNode.java Wed Feb 19 15:47:58 2014
@@ -37,7 +37,7 @@ public class NameNode implements Seriali
private Object myObject;
private transient IvmContext myContext;
private boolean unbound;
- public NameNode(NameNode parent, ParsedName name, Object obj, NameNode parentTree) {
+ public NameNode(final NameNode parent, final ParsedName name, final Object obj, final NameNode parentTree) {
atomicName = name.getComponent();
atomicHash = name.getComponentHashCode();
this.parent = parent;
@@ -52,7 +52,7 @@ public class NameNode implements Seriali
}
}
- void setMyContext(IvmContext myContext) {
+ void setMyContext(final IvmContext myContext) {
this.myContext = myContext;
}
@@ -66,17 +66,17 @@ public class NameNode implements Seriali
}
}
- public Object resolve(ParsedName name) throws NameNotFoundException {
- int compareResult = name.compareTo(atomicHash);
+ public Object resolve(final ParsedName name) throws NameNotFoundException {
+ final int compareResult = name.compareTo(atomicHash);
NameNotFoundException n = null;
- int pos = name.getPos();
+ final int pos = name.getPos();
if (compareResult == ParsedName.IS_EQUAL && name.getComponent().equals(atomicName)) {
// hashcodes and String valuse are equal
if (name.next()) {
if (subTree != null) {
try {
return subTree.resolve(name);
- } catch (NameNotFoundException e) {
+ } catch (final NameNotFoundException e) {
n = e;
}
}
@@ -97,11 +97,11 @@ public class NameNode implements Seriali
}
if (myObject instanceof Federation) {
name.reset(pos);
- String nameInContext = name.remaining().path();
+ final String nameInContext = name.remaining().path();
Federation f = null;
- for (Context c: (Federation)myObject) {
+ for (final Context c: (Federation)myObject) {
try {
- Object o = c.lookup(nameInContext);
+ final Object o = c.lookup(nameInContext);
if (o instanceof Context) {
if (f == null) {
f = new Federation();
@@ -110,12 +110,12 @@ public class NameNode implements Seriali
} else {
return o;
}
- } catch (NamingException e) {
+ } catch (final NamingException e) {
//ignore
}
}
if (f != null) {
- NameNode node = new NameNode(null, new ParsedName(""), f, null);
+ final NameNode node = new NameNode(null, new ParsedName(""), f, null);
return new IvmContext(node);
}
}
@@ -123,8 +123,8 @@ public class NameNode implements Seriali
throw new NameNotFoundException("Cannot resolve " + name);
}
- public void bind(ParsedName name, Object obj) throws NameAlreadyBoundException {
- int compareResult = name.compareTo(atomicHash);
+ public void bind(final ParsedName name, final Object obj) throws NameAlreadyBoundException {
+ final int compareResult = name.compareTo(atomicHash);
if (compareResult == ParsedName.IS_EQUAL && name.getComponent().equals(atomicName)) {
if (name.next()) {
if (myObject != null && !(myObject instanceof Federation)) {
@@ -169,7 +169,7 @@ public class NameNode implements Seriali
}
}
- public void tree(String indent, PrintStream out){
+ public void tree(final String indent, final PrintStream out){
out.println(atomicName + " @ " + atomicHash + (myObject != null ? " [" + myObject + "]" : ""));
if (grtrTree != null) {
@@ -187,7 +187,7 @@ public class NameNode implements Seriali
}
- public int compareTo(int otherHash) {
+ public int compareTo(final int otherHash) {
if (atomicHash == otherHash)
return 0;
else if (atomicHash > otherHash)
@@ -196,7 +196,7 @@ public class NameNode implements Seriali
return -1;
}
- private void bind(NameNode node) {
+ private void bind(final NameNode node) {
int compareResult = node.compareTo(atomicHash);
// This seems to be needed because of an inbalanced way
@@ -236,8 +236,8 @@ public class NameNode implements Seriali
}
}
- public void unbind(ParsedName name) throws NameAlreadyBoundException {
- int compareResult = name.compareTo(atomicHash);
+ public void unbind(final ParsedName name) throws NameAlreadyBoundException {
+ final int compareResult = name.compareTo(atomicHash);
if (compareResult == ParsedName.IS_EQUAL && name.getComponent().equals(atomicName)) {
if (name.next()) {
if (subTree != null) {
@@ -259,7 +259,7 @@ public class NameNode implements Seriali
}
}
- private void unbind(NameNode node) {
+ private void unbind(final NameNode node) {
if (subTree == node) {
subTree = null;
} else if (grtrTree == node){
@@ -270,7 +270,7 @@ public class NameNode implements Seriali
rebalance(this, node);
}
- private void rebalance(NameNode tree, NameNode node) {
+ private void rebalance(final NameNode tree, final NameNode node) {
if (node.subTree != null) {
tree.bind(node.subTree);
}
@@ -286,7 +286,7 @@ public class NameNode implements Seriali
prune(this);
}
- private void prune(NameNode until) {
+ private void prune(final NameNode until) {
if (subTree != null) {
subTree.prune(until);
}
@@ -308,7 +308,7 @@ public class NameNode implements Seriali
return hasChildren(this);
}
- private boolean hasChildren(NameNode node) {
+ private boolean hasChildren(final NameNode node) {
if (subTree != null && subTree.hasChildren(node)) return true;
if (grtrTree != null && grtrTree.hasChildren(node)) return true;
if (lessTree != null && lessTree.hasChildren(node)) return true;
@@ -331,13 +331,13 @@ public class NameNode implements Seriali
}
}
- public IvmContext createSubcontext(ParsedName name) throws NameAlreadyBoundException {
+ public IvmContext createSubcontext(final ParsedName name) throws NameAlreadyBoundException {
try {
bind(name, null);
name.reset();
return (IvmContext) resolve(name);
}
- catch (NameNotFoundException exception) {
+ catch (final NameNotFoundException exception) {
exception.printStackTrace();
throw new OpenEJBRuntimeException(exception);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NamingException.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NamingException.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NamingException.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NamingException.java Wed Feb 19 15:47:58 2014
@@ -24,12 +24,12 @@ import java.io.PrintWriter;
public class NamingException extends javax.naming.NamingException {
private OpenEJBException delegate;
- public NamingException(String message, OpenEJBException delegateArg) {
+ public NamingException(final String message, final OpenEJBException delegateArg) {
super(message);
delegate = delegateArg;
}
- public NamingException(String message, Throwable rootCause) {
+ public NamingException(final String message, final Throwable rootCause) {
super();
delegate = new OpenEJBException(message, rootCause);
}
@@ -42,11 +42,11 @@ public class NamingException extends jav
delegate.printStackTrace();
}
- public void printStackTrace(PrintStream stream) {
+ public void printStackTrace(final PrintStream stream) {
delegate.printStackTrace(stream);
}
- public void printStackTrace(PrintWriter writer) {
+ public void printStackTrace(final PrintWriter writer) {
delegate.printStackTrace(writer);
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/ObjectReference.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/ObjectReference.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/ObjectReference.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/ObjectReference.java Wed Feb 19 15:47:58 2014
@@ -22,7 +22,7 @@ public class ObjectReference extends Ref
private Object obj;
- public ObjectReference(Object obj) {
+ public ObjectReference(final Object obj) {
this.obj = obj;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/ParsedName.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/ParsedName.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/ParsedName.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/ParsedName.java Wed Feb 19 15:47:58 2014
@@ -37,7 +37,7 @@ public class ParsedName implements Seria
components[0] = "";
hashcode = 0;
} else if (path.length() > 0) {
- StringTokenizer st = new StringTokenizer(path, "/");
+ final StringTokenizer st = new StringTokenizer(path, "/");
components = new String[st.countTokens()];
for (int i = 0; st.hasMoreTokens() && i < components.length; i++)
components[i] = st.nextToken();
@@ -71,13 +71,13 @@ public class ParsedName implements Seria
return pos;
}
- public void reset(int pos) {
+ public void reset(final int pos) {
if (pos < 0 || pos >= components.length) throw new IllegalArgumentException("pos out of range 0 to " + components.length);
this.pos = pos;
hashcode = components[pos].hashCode();
}
- public int compareTo(int otherHash) {
+ public int compareTo(final int otherHash) {
if (hashcode == otherHash)
return 0;
else if (hashcode > otherHash)
@@ -90,23 +90,23 @@ public class ParsedName implements Seria
return hashcode;
}
- public int compareTo(String other) {
- int otherHash = other.hashCode();
+ public int compareTo(final String other) {
+ final int otherHash = other.hashCode();
return compareTo(otherHash);
}
- public static void main(String [] args) {
+ public static void main(final String [] args) {
- ParsedName name = new ParsedName("comp/env/jdbc/mydatabase");
+ final ParsedName name = new ParsedName("comp/env/jdbc/mydatabase");
while (name.next()) System.out.println(name.getComponent());
}
public ParsedName remaining() {
- ParsedName name = new ParsedName("");
- int next = pos +1;
+ final ParsedName name = new ParsedName("");
+ final int next = pos +1;
if (next > components.length) return name;
- String[] dest = new String[components.length - next];
+ final String[] dest = new String[components.length - next];
System.arraycopy(components, next, dest, 0, dest.length);
name.components = dest;
@@ -125,7 +125,7 @@ public class ParsedName implements Seria
if (components.length == 0) {
return "";
}
- StringBuilder buffer = new StringBuilder(components[0]);
+ final StringBuilder buffer = new StringBuilder(components[0]);
for (int i = 1; i < components.length; ++i) {
buffer.append('/');
buffer.append(components[i]);
@@ -138,16 +138,16 @@ with a slash. It may be the empty strin
/* Normalize the given pathname, whose length is len, starting at the given
offset; everything before this offset is already normal. */
- private String normalize(String pathname, int len, int off) {
+ private String normalize(final String pathname, final int len, final int off) {
if (len == 0) return pathname;
int n = len;
while (n > 0 && pathname.charAt(n - 1) == '/') n--;
if (n == 0) return "/";
- StringBuilder sb = new StringBuilder(pathname.length());
+ final StringBuilder sb = new StringBuilder(pathname.length());
if (off > 0) sb.append(pathname.substring(0, off));
char prevChar = 0;
for (int i = off; i < n; i++) {
- char c = pathname.charAt(i);
+ final char c = pathname.charAt(i);
if (prevChar == '/' && c == '/') continue;
sb.append(c);
prevChar = c;
@@ -158,11 +158,11 @@ with a slash. It may be the empty strin
/* Check that the given pathname is normal. If not, invoke the real
normalizer on the part of the pathname that requires normalization.
This way we iterate through the whole pathname string only once. */
- private String normalize(String pathname) {
- int n = pathname.length();
+ private String normalize(final String pathname) {
+ final int n = pathname.length();
char prevChar = 0;
for (int i = 0; i < n; i++) {
- char c = pathname.charAt(i);
+ final char c = pathname.charAt(i);
if (prevChar == '/' && c == '/')
return normalize(pathname, n, i - 1);
prevChar = c;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/PersistenceContextReference.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/PersistenceContextReference.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/PersistenceContextReference.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/PersistenceContextReference.java Wed Feb 19 15:47:58 2014
@@ -26,7 +26,7 @@ public class PersistenceContextReference
private EntityManager em;
- public PersistenceContextReference(EntityManager em) {
+ public PersistenceContextReference(final EntityManager em) {
this.em = em;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/PersistenceUnitReference.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/PersistenceUnitReference.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/PersistenceUnitReference.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/PersistenceUnitReference.java Wed Feb 19 15:47:58 2014
@@ -26,7 +26,7 @@ public class PersistenceUnitReference ex
private EntityManagerFactory emf;
- public PersistenceUnitReference(EntityManagerFactory emf) {
+ public PersistenceUnitReference(final EntityManagerFactory emf) {
this.emf = emf;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/SystemComponentReference.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/SystemComponentReference.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/SystemComponentReference.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/SystemComponentReference.java Wed Feb 19 15:47:58 2014
@@ -27,13 +27,13 @@ import javax.naming.NamingException;
public class SystemComponentReference extends Reference {
private final Class<? extends Object> type;
- public SystemComponentReference(Class<? extends Object> type) {
+ public SystemComponentReference(final Class<? extends Object> type) {
if (type == null) throw new NullPointerException("type is null");
this.type = type;
}
public Object getObject() throws NamingException {
- Object component = SystemInstance.get().getComponent(type);
+ final Object component = SystemInstance.get().getComponent(type);
if (component == null) {
throw new NameNotFoundException("No " + type.getSimpleName() + " registered with the OpenEJB system");
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/URLReference.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/URLReference.java?rev=1569795&r1=1569794&r2=1569795&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/URLReference.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/URLReference.java Wed Feb 19 15:47:58 2014
@@ -24,14 +24,14 @@ public class URLReference extends Refere
private String url;
- public URLReference(String url) {
+ public URLReference(final String url) {
this.url = url;
}
public Object getObject() throws NamingException {
try {
return new URL(url);
- } catch (MalformedURLException e) {
+ } catch (final MalformedURLException e) {
throw new NamingException("Invalid URL: " + url);
}
}