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 2013/03/14 12:36:33 UTC

svn commit: r1456397 - in /tomee/tomee/trunk: container/openejb-core/src/main/java/org/apache/openejb/core/security/ server/openejb-client/src/main/java/org/apache/openejb/client/ server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ server/o...

Author: andygumbrecht
Date: Thu Mar 14 11:36:33 2013
New Revision: 1456397

URL: http://svn.apache.org/r1456397
Log:
Fix https://issues.apache.org/jira/browse/OPENEJB-2006 ejbd/EjbRequestHandler.java
Formatting cleanup and finals.

Modified:
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java
    tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/ClusterableRequest.java
    tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/EJBRequest.java
    tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/Request.java
    tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/RequestType.java
    tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/OpenEJBLoginValidator.java
    tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/AuthRequestHandler.java
    tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/CallContext.java
    tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java
    tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbRequestHandler.java
    tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbServer.java
    tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java
    tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/BasicAuthHttpListenerWrapper.java

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java?rev=1456397&r1=1456396&r2=1456397&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java Thu Mar 14 11:36:33 2013
@@ -16,42 +16,41 @@
  */
 package org.apache.openejb.core.security;
 
-import org.apache.openejb.spi.SecurityService;
-import org.apache.openejb.spi.CallerPrincipal;
-import org.apache.openejb.core.ThreadContextListener;
+import org.apache.openejb.BeanContext;
+import org.apache.openejb.InterfaceType;
 import org.apache.openejb.core.ThreadContext;
+import org.apache.openejb.core.ThreadContextListener;
 import org.apache.openejb.core.security.jaas.GroupPrincipal;
 import org.apache.openejb.core.security.jacc.BasicJaccProvider;
 import org.apache.openejb.core.security.jacc.BasicPolicyConfiguration;
-import org.apache.openejb.InterfaceType;
-import org.apache.openejb.BeanContext;
 import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.spi.CallerPrincipal;
+import org.apache.openejb.spi.SecurityService;
 
 import javax.security.auth.Subject;
 import javax.security.auth.login.LoginException;
-import javax.security.jacc.PolicyContext;
 import javax.security.jacc.EJBMethodPermission;
 import javax.security.jacc.PolicyConfigurationFactory;
+import javax.security.jacc.PolicyContext;
 import java.io.Serializable;
+import java.lang.reflect.Method;
 import java.security.AccessControlContext;
-import java.security.PrivilegedAction;
-import java.security.AccessController;
-import java.security.Principal;
 import java.security.AccessControlException;
-import java.security.Permission;
+import java.security.AccessController;
 import java.security.Policy;
-import java.util.UUID;
-import java.util.List;
+import java.security.Principal;
+import java.security.PrivilegedAction;
 import java.util.ArrayList;
-import java.util.Enumeration;
 import java.util.Collections;
-import java.util.Properties;
-import java.util.Set;
+import java.util.Enumeration;
 import java.util.HashSet;
-import java.util.Map;
 import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
-import java.lang.reflect.Method;
 
 /**
  * This security service chooses a UUID as its token as this can be serialized
@@ -59,6 +58,7 @@ import java.lang.reflect.Method;
  * addition openejb-core classes.
  */
 public abstract class AbstractSecurityService implements SecurityService<UUID>, ThreadContextListener, BasicPolicyConfiguration.RoleResolver {
+
     static private final Map<Object, Identity> identities = new ConcurrentHashMap<Object, Identity>();
     static protected final ThreadLocal<Identity> clientIdentity = new ThreadLocal<Identity>();
     protected String defaultUser = "guest";
@@ -83,7 +83,6 @@ public abstract class AbstractSecuritySe
         SystemInstance.get().setComponent(BasicPolicyConfiguration.RoleResolver.class, this);
     }
 
-
     public String getRealmName() {
         return realmName;
     }
@@ -91,7 +90,7 @@ public abstract class AbstractSecuritySe
     public void setRealmName(final String realmName) {
         this.realmName = realmName;
     }
-    
+
     /**
      * @return the defaultUser
      */
@@ -104,7 +103,7 @@ public abstract class AbstractSecuritySe
      */
     public void setDefaultUser(final String defaultUser) {
         this.defaultUser = defaultUser;
-        
+
         // set the default subject and the default context for the new default user
         updateSecurityContext();
     }
@@ -114,7 +113,7 @@ public abstract class AbstractSecuritySe
         defaultSubject = createSubject(defaultUser);
         defaultContext = new SecurityContext(defaultSubject);
     }
-    
+
     @Override
     public void init(final Properties props) throws Exception {
     }
@@ -143,7 +142,7 @@ public abstract class AbstractSecuritySe
 
         SecurityContext securityContext = (oldContext != null) ? oldContext.get(SecurityContext.class) : null;
 
-        final BeanContext callingBeanContext = (oldContext != null)? oldContext.getBeanContext(): null;
+        final BeanContext callingBeanContext = (oldContext != null) ? oldContext.getBeanContext() : null;
         final Subject runAsSubject = getRunAsSubject(callingBeanContext);
         if (runAsSubject != null) {
 
@@ -152,7 +151,7 @@ public abstract class AbstractSecuritySe
         } else if (securityContext == null) {
 
             final Identity identity = clientIdentity.get();
-            if (identity != null){
+            if (identity != null) {
                 securityContext = new SecurityContext(identity.subject);
             } else {
                 securityContext = defaultContext;
@@ -163,7 +162,9 @@ public abstract class AbstractSecuritySe
     }
 
     protected Subject getRunAsSubject(final BeanContext callingBeanContext) {
-        if (callingBeanContext == null) return null;
+        if (callingBeanContext == null) {
+            return null;
+        }
 
         final String runAsRole = callingBeanContext.getRunAs();
         return createRunAsSubject(runAsRole);
@@ -192,7 +193,9 @@ public abstract class AbstractSecuritySe
     @Override
     public void logout(final UUID securityIdentity) throws LoginException {
         final Identity identity = identities.get(securityIdentity);
-        if (identity == null) throw new LoginException("Identity is not currently logged in: " + securityIdentity);
+        if (identity == null) {
+            throw new LoginException("Identity is not currently logged in: " + securityIdentity);
+        }
         identities.remove(securityIdentity);
     }
 
@@ -202,12 +205,18 @@ public abstract class AbstractSecuritySe
 
     @Override
     public void associate(final UUID securityIdentity) throws LoginException {
-        if (clientIdentity.get() != null) throw new LoginException("Thread already associated with a client identity.  Refusing to overwrite.");
-        if (securityIdentity == null) throw new NullPointerException("The security token passed in is null");
+        if (clientIdentity.get() != null) {
+            throw new LoginException("Thread already associated with a client identity.  Refusing to overwrite.");
+        }
+        if (securityIdentity == null) {
+            throw new NullPointerException("The security token passed in is null");
+        }
 
         // The securityIdentity token must associated with a logged in Identity
         final Identity identity = identities.get(securityIdentity);
-        if (identity == null) throw new LoginException("Identity is not currently logged in: " + securityIdentity);
+        if (identity == null) {
+            throw new LoginException("Identity is not currently logged in: " + securityIdentity);
+        }
 
         clientIdentity.set(identity);
     }
@@ -216,7 +225,7 @@ public abstract class AbstractSecuritySe
     public UUID disassociate() {
         try {
             final Identity identity = clientIdentity.get();
-            return (identity == null)? null: identity.getToken();
+            return (identity == null) ? null : identity.getToken();
         } finally {
             clientIdentity.remove();
         }
@@ -224,23 +233,25 @@ public abstract class AbstractSecuritySe
 
     @Override
     public boolean isCallerInRole(final String role) {
-        if (role == null) throw new IllegalArgumentException("Role must not be null");
+        if (role == null) {
+            throw new IllegalArgumentException("Role must not be null");
+        }
 
         final ThreadContext threadContext = ThreadContext.getThreadContext();
         final SecurityContext securityContext = threadContext.get(SecurityContext.class);
 
-    	final Set<Group> grps = securityContext.subject.getPrincipals(Group.class);
-    	for (final Group grp : grps) {
-			if(grp.getName().equals(role)) {
-				return true;
-			}
-		}
+        final Set<Group> grps = securityContext.subject.getPrincipals(Group.class);
+        for (final Group grp : grps) {
+            if (grp.getName().equals(role)) {
+                return true;
+            }
+        }
         final Set<GroupPrincipal> grpsp = securityContext.subject.getPrincipals(GroupPrincipal.class);
         for (final GroupPrincipal grp : grpsp) {
-        	if(grp.getName().equals(role)) {
-        		return true;
-        	}			
-		}
+            if (grp.getName().equals(role)) {
+                return true;
+            }
+        }
         return false;
     }
 
@@ -272,14 +283,12 @@ public abstract class AbstractSecuritySe
 
             final String ejbName = beanContext.getEjbName();
 
-            String name = (type == null)? null: type.getSpecName();
+            String name = (type == null) ? null : type.getSpecName();
             if ("LocalBean".equals(name) || "LocalBeanHome".equals(name)) {
                 name = null;
             }
 
-            final Permission permission = new EJBMethodPermission(ejbName, name, method);
-
-            if (permission != null) securityContext.acc.checkPermission(permission);
+            securityContext.acc.checkPermission(new EJBMethodPermission(ejbName, name, method));
 
         } catch (AccessControlException e) {
             return false;
@@ -308,7 +317,6 @@ public abstract class AbstractSecuritySe
             Thread.currentThread().setContextClassLoader(contextClassLoader);
         }
 
-
         final String policyProvider = SystemInstance.get().getOptions().get("javax.security.jacc.policy.provider", JaccProvider.Policy.class.getName());
         try {
             final ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
@@ -317,12 +325,14 @@ public abstract class AbstractSecuritySe
             policy.refresh();
             Policy.setPolicy(policy);
         } catch (Exception e) {
-            throw new IllegalStateException("Could not install JACC Policy Provider: "+policyProvider, e);
+            throw new IllegalStateException("Could not install JACC Policy Provider: " + policyProvider, e);
         }
     }
 
     protected Subject createSubject(final String name) {
-        if (name == null) return null;
+        if (name == null) {
+            return null;
+        }
 
         final User user = new User(name);
         final Group group = new Group(name);
@@ -352,6 +362,7 @@ public abstract class AbstractSecuritySe
         public final Subject subject;
         public final AccessControlContext acc;
 
+        @SuppressWarnings("unchecked")
         public SecurityContext(final Subject subject) {
             this.subject = subject;
             this.acc = (AccessControlContext) Subject.doAsPrivileged(subject, new PrivilegedAction() {
@@ -364,6 +375,7 @@ public abstract class AbstractSecuritySe
     }
 
     protected static class Identity implements Serializable {
+
         private final Subject subject;
         private final UUID token;
 
@@ -387,6 +399,7 @@ public abstract class AbstractSecuritySe
     }
 
     public static class Group implements java.security.acl.Group {
+
         private final List<Principal> members = new ArrayList<Principal>();
         private final String name;
 
@@ -421,6 +434,7 @@ public abstract class AbstractSecuritySe
     }
 
     public static class User implements Principal {
+
         private final String name;
 
         public User(final String name) {

Modified: tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/ClusterableRequest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/ClusterableRequest.java?rev=1456397&r1=1456396&r2=1456397&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/ClusterableRequest.java (original)
+++ tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/ClusterableRequest.java Thu Mar 14 11:36:33 2013
@@ -16,8 +16,8 @@
  */
 package org.apache.openejb.client;
 
-
 public interface ClusterableRequest extends Request {
+
     void setServerHash(int serverHash);
 
     int getServerHash();

Modified: tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/EJBRequest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/EJBRequest.java?rev=1456397&r1=1456396&r2=1456397&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/EJBRequest.java (original)
+++ tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/EJBRequest.java Thu Mar 14 11:36:33 2013
@@ -16,19 +16,19 @@
  */
 package org.apache.openejb.client;
 
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.lang.reflect.Method;
-import java.rmi.Remote;
+import org.omg.CORBA.ORB;
+
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.rmi.CORBA.Stub;
 import javax.rmi.CORBA.Tie;
 import javax.rmi.PortableRemoteObject;
-
-import org.omg.CORBA.ORB;
-
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.lang.reflect.Method;
+import java.rmi.Remote;
+import java.util.Arrays;
 
 public class EJBRequest implements ClusterableRequest {
 
@@ -118,6 +118,7 @@ public class EJBRequest implements Clust
 
     public static class Body implements java.io.Externalizable {
 
+        private transient volatile String toString = null;
         private transient EJBMetaDataImpl ejb;
         private transient ORB orb;
         private transient Method methodInstance;
@@ -165,6 +166,7 @@ public class EJBRequest implements Clust
             return methodParamTypes;
         }
 
+        @SuppressWarnings("unchecked")
         public void setMethodInstance(final Method methodInstance) {
             if (methodInstance == null) {
                 throw new NullPointerException("methodInstance input parameter is null");
@@ -212,6 +214,7 @@ public class EJBRequest implements Clust
             this.requestId = requestId;
         }
 
+        @SuppressWarnings("unchecked")
         @Override
         public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException {
 
@@ -220,34 +223,39 @@ public class EJBRequest implements Clust
             requestId = null;
             ClassNotFoundException result = null;
             primaryKey = null;
-//            methodClass = null;
             methodName = null;
             methodInstance = null;
             try {
                 requestId = (String) in.readObject();
                 primaryKey = in.readObject();
                 interfaceClass = (Class) in.readObject();
-//                methodClass = (Class) in.readObject();
             } catch (ClassNotFoundException cnfe) {
                 result = cnfe;
             }
+
             methodName = in.readUTF();
 
             try {
                 readMethodParameters(in);
             } catch (ClassNotFoundException cnfe) {
-                if (result == null) result = cnfe;
+                if (result == null) {
+                    result = cnfe;
+                }
             }
 
             if (interfaceClass != null) {
                 try {
                     methodInstance = interfaceClass.getMethod(methodName, methodParamTypes);
                 } catch (NoSuchMethodException nsme) {
-                    //if (result == null) result = nsme;
+                    if (result == null) {
+                        throw new ClassNotFoundException(interfaceClass.getSimpleName() + "#" + methodName + " is not valid");
+                    }
                 }
             }
-            if (result != null)
+
+            if (result != null) {
                 throw result;
+            }
         }
 
         @Override
@@ -260,7 +268,7 @@ public class EJBRequest implements Clust
             out.writeObject(primaryKey);
 
             out.writeObject(interfaceClass);
-//            out.writeObject(methodClass);
+            //            out.writeObject(methodClass);
             out.writeUTF(methodName);
 
             writeMethodParameters(out, methodParamTypes, methodParameters);
@@ -271,52 +279,52 @@ public class EJBRequest implements Clust
             out.writeByte(types.length);
 
             for (int i = 0; i < types.length; i++) {
-                final Class type = types[i];
+                final Class clazz = types[i];
                 Object obj = args[i];
 
-                if (type.isPrimitive()) {
-                    if (type == Byte.TYPE) {
-                        out.write(B);
+                if (clazz.isPrimitive()) {
+                    if (clazz == Byte.TYPE) {
+                        out.write(BYTE);
                         final byte bytevalue = (Byte) obj;
                         out.writeByte(bytevalue);
 
-                    } else if (type == Character.TYPE) {
-                        out.write(C);
+                    } else if (clazz == Character.TYPE) {
+                        out.write(CHAR);
                         final char charvalue = (Character) obj;
                         out.writeChar(charvalue);
 
-                    } else if (type == Integer.TYPE) {
-                        out.write(I);
+                    } else if (clazz == Integer.TYPE) {
+                        out.write(INT);
                         final int intvalue = (Integer) obj;
                         out.writeInt(intvalue);
 
-                    } else if (type == Boolean.TYPE) {
-                        out.write(Z);
+                    } else if (clazz == Boolean.TYPE) {
+                        out.write(BOOLEAN);
                         final boolean booleanvalue = (Boolean) obj;
                         out.writeBoolean(booleanvalue);
 
-                    } else if (type == Long.TYPE) {
-                        out.write(J);
+                    } else if (clazz == Long.TYPE) {
+                        out.write(LONG);
                         final long longvalue = (Long) obj;
                         out.writeLong(longvalue);
 
-                    } else if (type == Float.TYPE) {
-                        out.write(F);
+                    } else if (clazz == Float.TYPE) {
+                        out.write(FLOAT);
                         final float fvalue = (Float) obj;
                         out.writeFloat(fvalue);
 
-                    } else if (type == Double.TYPE) {
-                        out.write(D);
+                    } else if (clazz == Double.TYPE) {
+                        out.write(DOUBLE);
                         final double dvalue = (Double) obj;
                         out.writeDouble(dvalue);
 
-                    } else if (type == Short.TYPE) {
-                        out.write(S);
+                    } else if (clazz == Short.TYPE) {
+                        out.write(SHORT);
                         final short shortvalue = (Short) obj;
                         out.writeShort(shortvalue);
 
                     } else {
-                        throw new IOException("Unkown primitive type: " + type);
+                        throw new IOException("Unkown primitive type: " + clazz);
                     }
                 } else {
                     if (obj instanceof PortableRemoteObject && obj instanceof Remote) {
@@ -328,8 +336,8 @@ public class EJBRequest implements Clust
                         tie.orb(orb);
                         obj = PortableRemoteObject.toStub((Remote) obj);
                     }
-                    out.write(L);
-                    out.writeObject(type);
+                    out.write(OBJECT);
+                    out.writeObject(clazz);
                     out.writeObject(obj);
                 }
             }
@@ -376,53 +384,53 @@ public class EJBRequest implements Clust
             final Object[] args = new Object[length];
 
             for (int i = 0; i < types.length; i++) {
-                Class clazz = null;
-                Object obj = null;
+                final Class clazz;
+                final Object obj;
 
                 final int type = in.read();
 
                 switch (type) {
-                    case B:
+                    case BYTE:
                         clazz = Byte.TYPE;
                         obj = in.readByte();
                         break;
 
-                    case C:
+                    case CHAR:
                         clazz = Character.TYPE;
                         obj = in.readChar();
                         break;
 
-                    case I:
+                    case INT:
                         clazz = Integer.TYPE;
                         obj = in.readInt();
                         break;
 
-                    case Z:
+                    case BOOLEAN:
                         clazz = Boolean.TYPE;
                         obj = in.readBoolean();
                         break;
 
-                    case J:
+                    case LONG:
                         clazz = Long.TYPE;
                         obj = in.readLong();
                         break;
 
-                    case F:
+                    case FLOAT:
                         clazz = Float.TYPE;
                         obj = in.readFloat();
                         break;
 
-                    case D:
+                    case DOUBLE:
                         clazz = Double.TYPE;
                         obj = in.readDouble();
                         break;
 
-                    case S:
+                    case SHORT:
                         clazz = Short.TYPE;
                         obj = in.readShort();
                         break;
 
-                    case L:
+                    case OBJECT:
                         clazz = (Class) in.readObject();
                         obj = in.readObject();
                         if (obj instanceof Stub) {
@@ -443,16 +451,35 @@ public class EJBRequest implements Clust
             methodParameters = args;
         }
 
-        private static final int I = 0;
-        private static final int B = 1;
-        private static final int J = 2;
-        private static final int F = 3;
-        private static final int D = 4;
-        private static final int S = 5;
-        private static final int C = 6;
-        private static final int Z = 7;
-        private static final int L = 8;
-        private static final int A = 9;
+        private static final int INT = 0;
+        private static final int BYTE = 1;
+        private static final int LONG = 2;
+        private static final int FLOAT = 3;
+        private static final int DOUBLE = 4;
+        private static final int SHORT = 5;
+        private static final int CHAR = 6;
+        private static final int BOOLEAN = 7;
+        private static final int OBJECT = 8;
+
+        @Override
+        public String toString() {
+            if (null == toString) {
+                toString = "Body{" +
+                           "ejb=" + ejb +
+                           ", orb=" + orb +
+                           ", methodInstance=" + methodInstance +
+                           ", interfaceClass=" + interfaceClass +
+                           ", methodName='" + methodName + '\'' +
+                           ", methodParamTypes=" + (methodParamTypes == null ? null : Arrays.asList(methodParamTypes)) +
+                           ", methodParameters=" + (methodParameters == null ? null : Arrays.asList(methodParameters)) +
+                           ", primaryKey=" + primaryKey +
+                           ", requestId='" + requestId + '\'' +
+                           ", version=" + version +
+                           '}';
+            }
+
+            return toString;
+        }
     }
 
     @Override
@@ -514,9 +541,7 @@ public class EJBRequest implements Clust
             sb.append(", type=").append(requestMethod);
         }
         if (body != null) {
-            sb.append(", method='").append(body.getMethodName());
-            sb.append("', primaryKey='").append(body.getPrimaryKey());
-            sb.append("'");
+            sb.append(", ").append(body.toString());
         }
         sb.append("}");
         return sb.toString();
@@ -553,11 +578,14 @@ public class EJBRequest implements Clust
         try {
             clientIdentity = in.readObject();
         } catch (ClassNotFoundException cnfe) {
-            if (result == null) result = cnfe;
+            if (result == null) {
+                result = cnfe;
+            }
         }
         serverHash = in.readInt();
-        if (result != null)
+        if (result != null) {
             throw result;
+        }
     }
 
     @Override

Modified: tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/Request.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/Request.java?rev=1456397&r1=1456396&r2=1456397&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/Request.java (original)
+++ tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/Request.java Thu Mar 14 11:36:33 2013
@@ -25,8 +25,10 @@ public interface Request extends Externa
 
     public RequestType getRequestType();
 
+    @Override
     public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException;
 
+    @Override
     public void writeExternal(ObjectOutput out) throws IOException;
 }
 

Modified: tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/RequestType.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/RequestType.java?rev=1456397&r1=1456396&r2=1456397&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/RequestType.java (original)
+++ tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/RequestType.java Thu Mar 14 11:36:33 2013
@@ -19,11 +19,11 @@ package org.apache.openejb.client;
 import java.util.HashMap;
 import java.util.Map;
 
-
 /**
  *
  */
 public enum RequestType {
+
     NOP_REQUEST((byte) -1),
     EJB_REQUEST((byte) 0),
     JNDI_REQUEST((byte) 1),
@@ -38,10 +38,12 @@ public enum RequestType {
     private final static Map<Byte, RequestType> ENUM_MAP = new HashMap<Byte, RequestType>();
 
     static {
-        for (RequestType e : RequestType.values()) ENUM_MAP.put(e.code, e);
+        for (final RequestType e : RequestType.values()) {
+            ENUM_MAP.put(e.code, e);
+        }
     }
 
-    private RequestType(byte code) {
+    private RequestType(final byte code) {
         this.code = code;
     }
 
@@ -49,9 +51,11 @@ public enum RequestType {
         return code;
     }
 
-    public static RequestType valueOf(byte key) {
-        RequestType result = ENUM_MAP.get(key);
-        if (result == null) throw new IllegalArgumentException();
+    public static RequestType valueOf(final byte key) {
+        final RequestType result = ENUM_MAP.get(key);
+        if (result == null) {
+            throw new IllegalArgumentException();
+        }
         return result;
     }
 }

Modified: tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/OpenEJBLoginValidator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/OpenEJBLoginValidator.java?rev=1456397&r1=1456396&r2=1456397&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/OpenEJBLoginValidator.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/OpenEJBLoginValidator.java Thu Mar 14 11:36:33 2013
@@ -28,15 +28,17 @@ import javax.security.auth.callback.Call
 import javax.security.auth.login.LoginException;
 
 public class OpenEJBLoginValidator extends UsernameTokenValidator {
+
+    @SuppressWarnings("unchecked")
     @Override
-    protected void verifyDigestPassword(UsernameToken usernameToken,
-                                        RequestData data) throws WSSecurityException {
+    protected void verifyDigestPassword(final UsernameToken usernameToken,
+                                        final RequestData data) throws WSSecurityException {
         // check password
         super.verifyDigestPassword(usernameToken, data);
 
         // get the plain text password
-        WSPasswordCallback pwCb = new WSPasswordCallback(usernameToken.getName(),
-                null, usernameToken.getPasswordType(), WSPasswordCallback.USERNAME_TOKEN, data);
+        final WSPasswordCallback pwCb = new WSPasswordCallback(usernameToken.getName(),
+                                                               null, usernameToken.getPasswordType(), WSPasswordCallback.USERNAME_TOKEN, data);
         try {
             data.getCallbackHandler().handle(new Callback[]{pwCb});
         } catch (Exception e) {
@@ -46,8 +48,8 @@ public class OpenEJBLoginValidator exten
         // log the user
         final String user = usernameToken.getName();
         final String password = pwCb.getPassword();
-        SecurityService securityService = SystemInstance.get().getComponent(SecurityService.class);
-        Object token;
+        final SecurityService securityService = SystemInstance.get().getComponent(SecurityService.class);
+        final Object token;
         try {
             securityService.disassociate();
 

Modified: tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/AuthRequestHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/AuthRequestHandler.java?rev=1456397&r1=1456396&r2=1456397&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/AuthRequestHandler.java (original)
+++ tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/AuthRequestHandler.java Thu Mar 14 11:36:33 2013
@@ -20,42 +20,38 @@ import org.apache.openejb.client.Authent
 import org.apache.openejb.client.AuthenticationResponse;
 import org.apache.openejb.client.ClientMetaData;
 import org.apache.openejb.client.ResponseCodes;
-import org.apache.openejb.client.ThrowableArtifact;
 import org.apache.openejb.loader.SystemInstance;
 import org.apache.openejb.spi.SecurityService;
 import org.apache.openejb.util.LogCategory;
-import org.apache.openejb.util.Messages;
 import org.apache.openejb.util.Logger;
+import org.apache.openejb.util.Messages;
 
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import java.io.IOException;
-
-import javax.security.auth.login.LoginException;
 
 class AuthRequestHandler {
 
     Messages _messages = new Messages("org.apache.openejb.server.util.resources");
     private static final Logger logger = Logger.getInstance(LogCategory.OPENEJB_SERVER_REMOTE.createChild("auth"), "org.apache.openejb.server.util.resources");
 
-    AuthRequestHandler(EjbDaemon daemon) {
+    AuthRequestHandler(final EjbDaemon daemon) {
     }
 
-    public void processRequest(ObjectInputStream in, ObjectOutputStream out) {
-        AuthenticationRequest req = new AuthenticationRequest();
-        AuthenticationResponse res = new AuthenticationResponse();
+    public void processRequest(final ObjectInputStream in, final ObjectOutputStream out) {
+        final AuthenticationRequest req = new AuthenticationRequest();
+        final AuthenticationResponse res = new AuthenticationResponse();
 
         try {
             req.readExternal(in);
 
-            String securityRealm = req.getRealm();
-            String username = req.getUsername();
-            String password = req.getCredentials();
+            final String securityRealm = req.getRealm();
+            final String username = req.getUsername();
+            final String password = req.getCredentials();
 
-            SecurityService securityService = SystemInstance.get().getComponent(SecurityService.class);
-            Object token = securityService.login(securityRealm, username, password);
+            final SecurityService securityService = SystemInstance.get().getComponent(SecurityService.class);
+            final Object token = securityService.login(securityRealm, username, password);
 
-            ClientMetaData client = new ClientMetaData();
+            final ClientMetaData client = new ClientMetaData();
             client.setClientIdentity(token);
 
             res.setIdentity(client);
@@ -64,10 +60,11 @@ class AuthRequestHandler {
             res.setResponseCode(ResponseCodes.AUTH_DENIED);
             res.setDeniedCause(t);
         } finally {
-            if (logger.isDebugEnabled()){
+            if (logger.isDebugEnabled()) {
                 try {
-                    logger.debug("AUTH REQUEST: "+req+" -- RESPONSE: " + res);
-                } catch (Exception justInCase) {}
+                    logger.debug("AUTH REQUEST: " + req + " -- RESPONSE: " + res);
+                } catch (Exception justInCase) {
+                }
             }
 
             try {
@@ -78,5 +75,4 @@ class AuthRequestHandler {
         }
     }
 
-
 }
\ No newline at end of file

Modified: tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/CallContext.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/CallContext.java?rev=1456397&r1=1456396&r2=1456397&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/CallContext.java (original)
+++ tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/CallContext.java Thu Mar 14 11:36:33 2013
@@ -22,10 +22,11 @@ import org.apache.openejb.client.ServerM
 
 import java.util.HashMap;
 
+@SuppressWarnings("unchecked")
 public class CallContext {
 
-    private static final ThreadLocal threads = new ThreadLocal();
-    private final HashMap<Class, Object> data = new HashMap();
+    private static final ThreadLocal<CallContext> threads = new ThreadLocal<CallContext>();
+    private final HashMap data = new HashMap();
 
     public CallContext() {
     }
@@ -34,11 +35,11 @@ public class CallContext {
         data.clear();
     }
 
-    public <T> T get(Class<T> type) {
-        return (T)data.get(type);
+    public <T> T get(final Class<T> type) {
+        return (T) data.get(type);
     }
 
-    public <T> T set(Class<T> type, T value) {
+    public <T> T set(final Class<T> type, final T value) {
         return (T) data.put(type, value);
     }
 
@@ -46,38 +47,39 @@ public class CallContext {
         return get(BeanContext.class);
     }
 
-    public void setBeanContext(BeanContext info) {
+    public void setBeanContext(final BeanContext info) {
         set(BeanContext.class, info);
     }
 
-
-    public void setServerMetaData(ServerMetaData serverMetaData){
+    public void setServerMetaData(final ServerMetaData serverMetaData) {
         set(ServerMetaData.class, serverMetaData);
     }
 
-    public ServerMetaData getServerMetaData(){
+    public ServerMetaData getServerMetaData() {
         return get(ServerMetaData.class);
     }
-    
+
     public EJBRequest getEJBRequest() {
         return get(EJBRequest.class);
     }
 
-    public void setEJBRequest(EJBRequest request) {
+    public void setEJBRequest(final EJBRequest request) {
         set(EJBRequest.class, request);
     }
 
     public static void setCallContext(CallContext ctx) {
         if (ctx == null) {
-            ctx = (CallContext) threads.get();
-            if (ctx != null) ctx.reset();
+            ctx = threads.get();
+            if (ctx != null) {
+                ctx.reset();
+            }
         } else {
             threads.set(ctx);
         }
     }
 
     public static CallContext getCallContext() {
-        CallContext ctx = (CallContext) threads.get();
+        CallContext ctx = threads.get();
         if (ctx == null) {
             ctx = new CallContext();
             threads.set(ctx);

Modified: tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java?rev=1456397&r1=1456396&r2=1456397&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java (original)
+++ tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java Thu Mar 14 11:36:33 2013
@@ -75,7 +75,7 @@ public class EjbDaemon implements org.ap
 
     public void init(final Properties props) throws Exception {
         containerSystem = SystemInstance.get().getComponent(ContainerSystem.class);
-//        deploymentIndex = new DeploymentIndex(containerSystem.deployments());
+        //        deploymentIndex = new DeploymentIndex(containerSystem.deployments());
 
         clientObjectFactory = new ClientObjectFactory(this, props);
 
@@ -272,7 +272,9 @@ public class EjbDaemon implements org.ap
     protected BeanContext getDeployment(final EJBRequest req) throws RemoteException {
         final String deploymentId = req.getDeploymentId();
         final BeanContext beanContext = containerSystem.getBeanContext(deploymentId);
-        if (beanContext == null) throw new RemoteException("No deployment: " + deploymentId);
+        if (beanContext == null) {
+            throw new RemoteException("No deployment: " + deploymentId);
+        }
         return beanContext;
     }
 

Modified: tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbRequestHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbRequestHandler.java?rev=1456397&r1=1456396&r2=1456397&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbRequestHandler.java (original)
+++ tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbRequestHandler.java Thu Mar 14 11:36:33 2013
@@ -32,6 +32,7 @@ import org.apache.openejb.spi.SecuritySe
 import org.apache.openejb.util.LogCategory;
 import org.apache.openejb.util.Logger;
 
+import javax.security.auth.login.LoginException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.rmi.RemoteException;
@@ -43,6 +44,7 @@ import java.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 class EjbRequestHandler {
+
     public static final ServerSideResolver SERVER_SIDE_RESOLVER = new ServerSideResolver();
 
     private static final Logger logger = Logger.getInstance(LogCategory.OPENEJB_SERVER_REMOTE.createChild("ejb"), "org.apache.openejb.server.util.resources");
@@ -83,56 +85,72 @@ class EjbRequestHandler {
         }
 
         final SecurityService securityService = SystemInstance.get().getComponent(SecurityService.class);
+        boolean failed = false;
+        final CallContext call;
+
         try {
-            final Object clientIdentity = req.getClientIdentity();
-            if (clientIdentity != null) {//noinspection unchecked
-                securityService.associate(clientIdentity);
+            try {
+                final Object clientIdentity = req.getClientIdentity();
+                if (clientIdentity != null) {//noinspection unchecked
+                    securityService.associate(clientIdentity);
+                }
+            } catch (LoginException t) {
+                replyWithFatalError(version, out, t, "Client identity is not valid - " + req);
+                failed = true;
+                return;
             }
-        } catch (Throwable t) {
-            replyWithFatalError(version, out, t, "Client identity is not valid - " + req);
-            return;
-        }
 
-        final CallContext call;
-        final BeanContext di;
+            final BeanContext di;
 
-        try {
-            di = this.daemon.getDeployment(req);
-        } catch (RemoteException e) {
-            replyWithFatalError(version, out, e, "No such deployment");
-            return;
-        } catch (Throwable t) {
-            replyWithFatalError(version, out, t, "Unkown error occured while retrieving deployment");
-            return;
-        }
+            try {
+                di = this.daemon.getDeployment(req);
+            } catch (RemoteException e) {
+                replyWithFatalError(version, out, e, "No such deployment");
+                failed = true;
+                return;
+            } catch (Throwable t) {
+                replyWithFatalError(version, out, t, "Unkown error occured while retrieving deployment: " + req);
+                failed = true;
+                return;
+            }
 
-        //  Need to set this for deserialization of the body
-        final ClassLoader classLoader = di.getBeanClass().getClassLoader();
-        Thread.currentThread().setContextClassLoader(classLoader);
+            try {
 
-        try {
-            res.start(EJBResponse.Time.DESERIALIZATION);
+                //Need to set this for deserialization of the body - Will always be reset by EjbDaemon
+                final ClassLoader classLoader = di.getBeanClass().getClassLoader();
+                Thread.currentThread().setContextClassLoader(classLoader);
 
-            req.getBody().readExternal(in);
-            version = req.getVersion();
+                res.start(EJBResponse.Time.DESERIALIZATION);
 
-            res.stop(EJBResponse.Time.DESERIALIZATION);
-        } catch (Throwable t) {
-            replyWithFatalError(version, out, t, "Error caught during request processing");
-            return;
-        }
+                req.getBody().readExternal(in);
+                version = req.getVersion();
 
-        try {
-            call = CallContext.getCallContext();
-            call.setEJBRequest(req);
-            call.setBeanContext(di);
-        } catch (Throwable t) {
-            replyWithFatalError(version, out, t, "Unable to set the thread context for this request");
-            return;
+                res.stop(EJBResponse.Time.DESERIALIZATION);
+            } catch (Throwable t) {
+                replyWithFatalError(version, out, t, "Error caught during request body deserialization: " + req);
+                failed = true;
+                return;
+            }
+
+            try {
+                call = CallContext.getCallContext();
+                call.setEJBRequest(req);
+                call.setBeanContext(di);
+            } catch (Throwable t) {
+                replyWithFatalError(version, out, t, "Unable to set the thread call context for this request: " + req);
+                failed = true;
+                return;
+            }
+
+        } finally {
+            if (failed) {
+                securityService.disassociate();
+            }
         }
 
         res.start(EJBResponse.Time.CONTAINER);
         boolean respond = true;
+
         try {
             switch (req.getRequestMethod()) {
                 // Remote interface methods
@@ -205,9 +223,10 @@ class EjbRequestHandler {
                 case FUTURE_CANCEL:
                     doFUTURE_CANCEL_METHOD(req, res);
                     break;
-            }
 
-            res.stop(EJBResponse.Time.CONTAINER);
+                default:
+                    throw new org.apache.openejb.SystemException("Unexpected request method: " + req.getRequestMethod());
+            }
 
         } catch (org.apache.openejb.InvalidateReferenceException e) {
             res.setResponse(version, ResponseCodes.EJB_SYS_EXCEPTION, new ThrowableArtifact(e.getRootCause()));
@@ -215,7 +234,7 @@ class EjbRequestHandler {
             res.setResponse(version, ResponseCodes.EJB_APP_EXCEPTION, new ThrowableArtifact(e.getRootCause()));
         } catch (org.apache.openejb.SystemException e) {
             res.setResponse(version, ResponseCodes.EJB_ERROR, new ThrowableArtifact(e.getRootCause()));
-            logger.error(req + ": OpenEJB encountered an unknown system error in container: ", e);
+            logger.error("System error in container for request: " + req, e);
         } catch (Throwable t) {
 
             replyWithFatalError(version, out, t, "Unknown error in container");
@@ -223,6 +242,12 @@ class EjbRequestHandler {
 
         } finally {
 
+            try {
+                res.stop(EJBResponse.Time.CONTAINER);
+            } catch (Throwable e) {
+                //Ignore
+            }
+
             if (logger.isDebugEnabled()) {
                 //The req and res toString overrides are volatile
                 try {
@@ -281,19 +306,19 @@ class EjbRequestHandler {
             }
             final RpcContainer c = (RpcContainer) call.getBeanContext().getContainer();
 
-//            Object result = c.invoke(req.getDeploymentId(),
-//                    req.getInterfaceClass(), req.getMethodInstance(),
-//                    req.getMethodParameters(),
-//                    req.getPrimaryKey()
-//            );
+            //            Object result = c.invoke(req.getDeploymentId(),
+            //                    req.getInterfaceClass(), req.getMethodInstance(),
+            //                    req.getMethodParameters(),
+            //                    req.getPrimaryKey()
+            //            );
 
             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) {
@@ -315,13 +340,13 @@ class EjbRequestHandler {
         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);
     }
@@ -332,13 +357,13 @@ class EjbRequestHandler {
         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;
@@ -357,13 +382,13 @@ class EjbRequestHandler {
         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) {
@@ -405,9 +430,9 @@ class EjbRequestHandler {
         } 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);
@@ -436,13 +461,13 @@ class EjbRequestHandler {
         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);
     }
@@ -461,13 +486,13 @@ class EjbRequestHandler {
         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);
     }
@@ -478,13 +503,13 @@ class EjbRequestHandler {
         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);
     }
@@ -497,7 +522,7 @@ class EjbRequestHandler {
 
         //This is fatal for the client, but not the server.
         if (logger.isWarningEnabled()) {
-            logger.warning(message + " - Debug for stacktrace: " + error);
+            logger.warning(message + " - Debug " + logger + " for stacktrace: " + error);
         } else if (logger.isDebugEnabled()) {
             logger.debug(message, error);
         }

Modified: tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbServer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbServer.java?rev=1456397&r1=1456396&r2=1456397&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbServer.java (original)
+++ tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbServer.java Thu Mar 14 11:36:33 2013
@@ -74,10 +74,12 @@ public class EjbServer implements org.ap
 
     @Override
     public void service(final InputStream inputStream, final OutputStream outputStream) throws ServiceException, IOException {
+
         ServerFederation.setApplicationServer(server);
         final ClassLoader oldCl = Thread.currentThread().getContextClassLoader();
-        Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
+
         try {
+            Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
             server.service(inputStream, outputStream);
         } finally {
             Thread.currentThread().setContextClassLoader(oldCl);

Modified: tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java?rev=1456397&r1=1456396&r2=1456397&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java (original)
+++ tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java Thu Mar 14 11:36:33 2013
@@ -75,7 +75,6 @@ import java.util.Set;
 
 import static org.apache.openejb.server.ejbd.ClientObjectFactory.convert;
 
-
 class JndiRequestHandler {
 
     private static final Logger logger = Logger.getInstance(LogCategory.OPENEJB_SERVER_REMOTE.createChild("jndi"), "org.apache.openejb.server.util.resources");
@@ -89,8 +88,8 @@ class JndiRequestHandler {
     private final ClusterableRequestHandler clusterableRequestHandler;
     private Context rootContext;
 
-    JndiRequestHandler(EjbDaemon daemon) throws Exception {
-        ContainerSystem containerSystem = SystemInstance.get().getComponent(ContainerSystem.class);
+    JndiRequestHandler(final EjbDaemon daemon) throws Exception {
+        final ContainerSystem containerSystem = SystemInstance.get().getComponent(ContainerSystem.class);
         ejbJndiTree = (Context) containerSystem.getJNDIContext().lookup("openejb/remote");
         deploymentsJndiTree = (Context) containerSystem.getJNDIContext().lookup("openejb/Deployment");
 
@@ -108,15 +107,15 @@ class JndiRequestHandler {
         return new BasicClusterableRequestHandler();
     }
 
-    public void processRequest(ObjectInputStream in, ObjectOutputStream out) {
-        JNDIResponse res = new JNDIResponse();
+    public void processRequest(final ObjectInputStream in, final ObjectOutputStream out) {
+        final JNDIResponse res = new JNDIResponse();
         JNDIRequest req = null;
         try {
             req = new JNDIRequest();
             req.readExternal(in);
         } catch (Throwable e) {
             res.setResponseCode(ResponseCodes.JNDI_NAMING_EXCEPTION);
-            NamingException namingException = new NamingException("Could not read jndi request");
+            final NamingException namingException = new NamingException("Could not read jndi request");
             namingException.setRootCause(e);
             res.setResult(new ThrowableArtifact(namingException));
 
@@ -139,7 +138,7 @@ class JndiRequestHandler {
             if (req.getRequestString().startsWith("/")) {
                 req.setRequestString(req.getRequestString().substring(1));
             }
-            String prefix = getPrefix(req);
+            final String prefix = getPrefix(req);
 
             switch (req.getRequestMethod()) {
                 case JNDI_LOOKUP:
@@ -152,7 +151,7 @@ class JndiRequestHandler {
 
         } catch (Throwable e) {
             res.setResponseCode(ResponseCodes.JNDI_NAMING_EXCEPTION);
-            NamingException namingException = new NamingException("Unknown error in container");
+            final NamingException namingException = new NamingException("Unknown error in container");
             namingException.setRootCause(e);
             res.setResult(new ThrowableArtifact(namingException));
         } finally {
@@ -177,13 +176,13 @@ class JndiRequestHandler {
     private void logRequestResponse(final JNDIRequest req, final JNDIResponse res) {
         final RequestInfos.RequestInfo info = RequestInfos.info();
         logger.debug("JNDI REQUEST: " + req + " (size = " + info.inputStream.getCount()
-                    + "b, remote-ip =" + info.ip
-                    + ") -- RESPONSE: " + res + " (size = " + info.outputStream.getCount() + "b)");
+                     + "b, remote-ip =" + info.ip
+                     + ") -- RESPONSE: " + res + " (size = " + info.outputStream.getCount() + "b)");
     }
 
-    private String getPrefix(JNDIRequest req) throws NamingException {
-        String prefix;
-        String name = req.getRequestString();
+    private String getPrefix(final JNDIRequest req) throws NamingException {
+        final String prefix;
+        final String name = req.getRequestString();
 
         if (name.startsWith("openejb/Deployment/")) {
             prefix = "";
@@ -199,19 +198,21 @@ class JndiRequestHandler {
         return prefix;
     }
 
-    private void doLookup(JNDIRequest req, JNDIResponse res, String prefix) {
+    private void doLookup(final JNDIRequest req, final JNDIResponse res, final String prefix) {
         Object object;
-        String name = req.getRequestString();
+        final String name = req.getRequestString();
 
         try {
 
             if (name.equals("info/injections")) {
 
                 //noinspection unchecked
-                List<Injection> injections = (List<Injection>) rootContext.lookup(prefix + name);
-                InjectionMetaData metaData = new InjectionMetaData();
-                for (Injection injection : injections) {
-                    if (injection.getTarget() == null) continue;
+                final List<Injection> injections = (List<Injection>) rootContext.lookup(prefix + name);
+                final InjectionMetaData metaData = new InjectionMetaData();
+                for (final Injection injection : injections) {
+                    if (injection.getTarget() == null) {
+                        continue;
+                    }
                     metaData.addInjection(injection.getTarget().getName(), injection.getName(), injection.getJndiName());
                 }
                 res.setResponseCode(ResponseCodes.JNDI_INJECTIONS);
@@ -233,8 +234,8 @@ class JndiRequestHandler {
             } else if (object instanceof DataSource) {
                 if (DataSourceFactory.knows(object)) {
                     try {
-                        DbcpDataSource cf = new DbcpDataSource(object);
-                        DataSourceMetaData dataSourceMetaData = new DataSourceMetaData(cf.getDriverClassName(), cf.getUrl(), cf.getUsername(), cf.getPassword());
+                        final DbcpDataSource cf = new DbcpDataSource(object);
+                        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) {
@@ -273,7 +274,7 @@ class JndiRequestHandler {
                 return;
             }
 
-            ServiceRefData serviceRef;
+            final ServiceRefData serviceRef;
             if (object instanceof ServiceRefData) {
                 serviceRef = (ServiceRefData) object;
             } else {
@@ -281,7 +282,7 @@ class JndiRequestHandler {
             }
 
             if (serviceRef != null) {
-                WsMetaData serviceMetaData = new WsMetaData();
+                final WsMetaData serviceMetaData = new WsMetaData();
 
                 // service class
                 String serviceClassName = null;
@@ -303,7 +304,7 @@ class JndiRequestHandler {
                 }
 
                 // get the port addresses for this service
-                PortAddressRegistry portAddressRegistry = SystemInstance.get().getComponent(PortAddressRegistry.class);
+                final PortAddressRegistry portAddressRegistry = SystemInstance.get().getComponent(PortAddressRegistry.class);
                 Set<PortAddress> portAddresses = null;
                 if (portAddressRegistry != null) {
                     portAddresses = portAddressRegistry.getPorts(serviceRef.getId(), serviceRef.getServiceQName(), referenceClassName);
@@ -314,27 +315,27 @@ class JndiRequestHandler {
                     serviceMetaData.setWsdlUrl(serviceRef.getWsdlURL().toExternalForm());
                 }
                 if (portAddresses.size() == 1) {
-                    PortAddress portAddress = portAddresses.iterator().next();
+                    final PortAddress portAddress = portAddresses.iterator().next();
                     serviceMetaData.setWsdlUrl(portAddress.getAddress() + "?wsdl");
                 }
 
                 // add handler chains
-                for (HandlerChainData handlerChain : serviceRef.getHandlerChains()) {
-                    HandlerChainMetaData handlerChainMetaData = new HandlerChainMetaData();
+                for (final HandlerChainData handlerChain : serviceRef.getHandlerChains()) {
+                    final HandlerChainMetaData handlerChainMetaData = new HandlerChainMetaData();
                     handlerChainMetaData.setServiceNamePattern(handlerChain.getServiceNamePattern());
                     handlerChainMetaData.setPortNamePattern(handlerChain.getPortNamePattern());
                     handlerChainMetaData.getProtocolBindings().addAll(handlerChain.getProtocolBindings());
-                    for (HandlerData handler : handlerChain.getHandlers()) {
-                        HandlerMetaData handlerMetaData = new HandlerMetaData();
+                    for (final HandlerData handler : handlerChain.getHandlers()) {
+                        final HandlerMetaData handlerMetaData = new HandlerMetaData();
                         handlerMetaData.setHandlerClass(handler.getHandlerClass().getName());
-                        for (Method method : handler.getPostConstruct()) {
-                            CallbackMetaData callbackMetaData = new CallbackMetaData();
+                        for (final Method method : handler.getPostConstruct()) {
+                            final CallbackMetaData callbackMetaData = new CallbackMetaData();
                             callbackMetaData.setClassName(method.getDeclaringClass().getName());
                             callbackMetaData.setMethod(method.getName());
                             handlerMetaData.getPostConstruct().add(callbackMetaData);
                         }
-                        for (Method method : handler.getPreDestroy()) {
-                            CallbackMetaData callbackMetaData = new CallbackMetaData();
+                        for (final Method method : handler.getPreDestroy()) {
+                            final CallbackMetaData callbackMetaData = new CallbackMetaData();
                             callbackMetaData.setClassName(method.getDeclaringClass().getName());
                             callbackMetaData.setMethod(method.getName());
                             handlerMetaData.getPreDestroy().add(callbackMetaData);
@@ -345,9 +346,9 @@ class JndiRequestHandler {
                 }
 
                 // add port refs
-                Map<QName, PortRefMetaData> portsByQName = new HashMap<QName, PortRefMetaData>();
-                for (PortRefData portRef : serviceRef.getPortRefs()) {
-                    PortRefMetaData portRefMetaData = new PortRefMetaData();
+                final Map<QName, PortRefMetaData> portsByQName = new HashMap<QName, PortRefMetaData>();
+                for (final PortRefData portRef : serviceRef.getPortRefs()) {
+                    final PortRefMetaData portRefMetaData = new PortRefMetaData();
                     portRefMetaData.setQName(portRef.getQName());
                     portRefMetaData.setServiceEndpointInterface(portRef.getServiceEndpointInterface());
                     portRefMetaData.setEnableMtom(portRef.isEnableMtom());
@@ -360,7 +361,7 @@ class JndiRequestHandler {
                 }
 
                 // add PortRefMetaData for any portAddress not added above
-                for (PortAddress portAddress : portAddresses) {
+                for (final PortAddress portAddress : portAddresses) {
                     PortRefMetaData portRefMetaData = portsByQName.get(portAddress.getPortQName());
                     if (portRefMetaData == null) {
                         portRefMetaData = new PortRefMetaData();
@@ -389,13 +390,12 @@ class JndiRequestHandler {
             return;
         }
 
-
         BaseEjbProxyHandler handler;
         try {
             handler = (BaseEjbProxyHandler) ProxyManager.getInvocationHandler(object);
         } catch (Exception e) {
             try {
-                Field field = object.getClass().getDeclaredField("invocationHandler");
+                final Field field = object.getClass().getDeclaredField("invocationHandler");
                 field.setAccessible(true);
                 handler = (BaseEjbProxyHandler) field.get(object);
             } catch (Exception e1) {
@@ -406,31 +406,34 @@ class JndiRequestHandler {
                     return;
                 } else {
                     res.setResponseCode(ResponseCodes.JNDI_NAMING_EXCEPTION);
-                    NamingException namingException = new NamingException("Expected an ejb proxy, found unknown object: type=" + object.getClass().getName() + ", toString=" + object);
+                    final NamingException namingException = new NamingException("Expected an ejb proxy, found unknown object: type=" +
+                                                                                object.getClass().getName() +
+                                                                                ", toString=" +
+                                                                                object);
                     res.setResult(new ThrowableArtifact(namingException));
                     return;
                 }
             }
         }
 
-        ProxyInfo proxyInfo = handler.getProxyInfo();
-        BeanContext beanContext = proxyInfo.getBeanContext();
-        String deploymentID = beanContext.getDeploymentID().toString();
+        final ProxyInfo proxyInfo = handler.getProxyInfo();
+        final BeanContext beanContext = proxyInfo.getBeanContext();
+        final String deploymentID = beanContext.getDeploymentID().toString();
 
         updateServer(req, res, proxyInfo);
 
         switch (proxyInfo.getInterfaceType()) {
             case EJB_HOME: {
                 res.setResponseCode(ResponseCodes.JNDI_EJBHOME);
-                EJBMetaDataImpl metaData = new EJBMetaDataImpl(beanContext.getHomeInterface(),
-                                                               beanContext.getRemoteInterface(),
-                                                               beanContext.getPrimaryKeyClass(),
-                                                               beanContext.getComponentType().toString(),
-                                                               deploymentID,
-                                                               -1,
-                                                               convert(proxyInfo.getInterfaceType()),
-                                                               null,
-                                                               beanContext.getAsynchronousMethodSignatures());
+                final EJBMetaDataImpl metaData = new EJBMetaDataImpl(beanContext.getHomeInterface(),
+                                                                     beanContext.getRemoteInterface(),
+                                                                     beanContext.getPrimaryKeyClass(),
+                                                                     beanContext.getComponentType().toString(),
+                                                                     deploymentID,
+                                                                     -1,
+                                                                     convert(proxyInfo.getInterfaceType()),
+                                                                     null,
+                                                                     beanContext.getAsynchronousMethodSignatures());
                 metaData.loadProperties(beanContext.getProperties());
                 log(metaData);
                 res.setResult(metaData);
@@ -438,21 +441,23 @@ class JndiRequestHandler {
             }
             case EJB_LOCAL_HOME: {
                 res.setResponseCode(ResponseCodes.JNDI_NAMING_EXCEPTION);
-                NamingException namingException = new NamingException("Not remotable: '" + name + "'. EJBLocalHome interfaces are not remotable as per the EJB specification.");
+                final NamingException namingException = new NamingException("Not remotable: '" +
+                                                                            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);
-                EJBMetaDataImpl metaData = new EJBMetaDataImpl(null,
-                                                               null,
-                                                               beanContext.getPrimaryKeyClass(),
-                                                               beanContext.getComponentType().toString(),
-                                                               deploymentID,
-                                                               -1,
-                                                               convert(proxyInfo.getInterfaceType()),
-                                                               proxyInfo.getInterfaces(),
-                                                               beanContext.getAsynchronousMethodSignatures());
+                final EJBMetaDataImpl metaData = new EJBMetaDataImpl(null,
+                                                                     null,
+                                                                     beanContext.getPrimaryKeyClass(),
+                                                                     beanContext.getComponentType().toString(),
+                                                                     deploymentID,
+                                                                     -1,
+                                                                     convert(proxyInfo.getInterfaceType()),
+                                                                     proxyInfo.getInterfaces(),
+                                                                     beanContext.getAsynchronousMethodSignatures());
                 metaData.setPrimaryKey(proxyInfo.getPrimaryKey());
                 metaData.loadProperties(beanContext.getProperties());
 
@@ -462,26 +467,28 @@ class JndiRequestHandler {
             }
             case BUSINESS_LOCAL: {
                 res.setResponseCode(ResponseCodes.JNDI_NAMING_EXCEPTION);
-                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.");
+                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.");
                 res.setResult(new ThrowableArtifact(namingException));
                 break;
             }
             case LOCALBEAN: {
                 res.setResponseCode(ResponseCodes.JNDI_NAMING_EXCEPTION);
-                NamingException namingException = new NamingException("Not remotable: '" + name + "'. LocalBean classes are not remotable as per the EJB specification.");
+                final NamingException namingException = new NamingException("Not remotable: '" + name + "'. LocalBean classes are not remotable as per the EJB specification.");
                 res.setResult(new ThrowableArtifact(namingException));
                 break;
             }
             default: {
                 res.setResponseCode(ResponseCodes.JNDI_NAMING_EXCEPTION);
-                NamingException namingException = new NamingException("Not remotable: '" + name + "'.");
+                final NamingException namingException = new NamingException("Not remotable: '" + name + "'.");
                 res.setResult(new ThrowableArtifact(namingException));
             }
         }
 
     }
 
-    private void log(EJBMetaDataImpl metaData) {
+    private void log(final EJBMetaDataImpl metaData) {
         if (logger.isDebugEnabled()) {
             final StringBuilder sb = new StringBuilder();
             sb.append("Sending Ejb(");
@@ -490,7 +497,7 @@ class JndiRequestHandler {
             sb.append(metaData.getDeploymentID());
             sb.append(", properties=[");
             final String delimiter = "|";
-            for (Map.Entry<Object, Object> entry : metaData.getProperties().entrySet()) {
+            for (final Map.Entry<Object, Object> entry : metaData.getProperties().entrySet()) {
                 sb.append(entry.getKey()).append("=").append(entry.getValue()).append(delimiter);
             }
             if (metaData.getProperties().size() > 1) {
@@ -501,21 +508,21 @@ class JndiRequestHandler {
         }
     }
 
-    protected void updateServer(JNDIRequest req, JNDIResponse res, ProxyInfo proxyInfo) {
+    protected void updateServer(final JNDIRequest req, final JNDIResponse res, final ProxyInfo proxyInfo) {
         clusterableRequestHandler.updateServer(proxyInfo.getBeanContext(), req, res);
     }
 
-    private void doList(JNDIRequest req, JNDIResponse res, String prefix) {
-        String name = req.getRequestString();
+    private void doList(final JNDIRequest req, final JNDIResponse res, final String prefix) {
+        final String name = req.getRequestString();
         try {
-            NamingEnumeration<NameClassPair> namingEnumeration = rootContext.list(prefix + name);
+            final NamingEnumeration<NameClassPair> namingEnumeration = rootContext.list(prefix + name);
             if (namingEnumeration == null) {
                 res.setResponseCode(ResponseCodes.JNDI_OK);
                 res.setResult(null);
             } else {
                 res.setResponseCode(ResponseCodes.JNDI_ENUMERATION);
-                ArrayList<NameClassPair> list = Collections.list(namingEnumeration);
-                for (NameClassPair pair : list) {
+                final ArrayList<NameClassPair> list = Collections.list(namingEnumeration);
+                for (final NameClassPair pair : list) {
                     if (pair.getClassName().equals(IvmContext.class.getName())) {
                         pair.setClassName(javax.naming.Context.class.getName());
                     }
@@ -530,23 +537,23 @@ class JndiRequestHandler {
         }
     }
 
-
+    @SuppressWarnings("unchecked")
     public static class DbcpDataSource {
 
         private final Object object;
         private final Class clazz;
 
-        public DbcpDataSource(Object object) {
+        public DbcpDataSource(final Object object) {
             clazz = object.getClass();
             this.object = object;
         }
 
         public java.lang.String getDriverClassName() throws Exception {
             try {
-            return (String) clazz.getMethod("getDriverClassName").invoke(object);
+                return (String) clazz.getMethod("getDriverClassName").invoke(object);
             } catch (NoSuchMethodException nsme) {
                 return (String) clazz.getMethod("getDriverClass").invoke(object);
-        }
+            }
         }
 
         public java.lang.String getPassword() throws Exception {
@@ -555,10 +562,10 @@ class JndiRequestHandler {
 
         public java.lang.String getUrl() throws Exception {
             try {
-            return (String) clazz.getMethod("getUrl").invoke(object);
+                return (String) clazz.getMethod("getUrl").invoke(object);
             } catch (NoSuchMethodException nsme) {
                 return (String) clazz.getMethod("getJdbcUrl").invoke(object);
-        }
+            }
         }
 
         public java.lang.String getUsername() throws Exception {

Modified: tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/BasicAuthHttpListenerWrapper.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/BasicAuthHttpListenerWrapper.java?rev=1456397&r1=1456396&r2=1456397&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/BasicAuthHttpListenerWrapper.java (original)
+++ tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/BasicAuthHttpListenerWrapper.java Thu Mar 14 11:36:33 2013
@@ -24,26 +24,29 @@ import org.apache.openejb.util.Base64;
 import javax.security.auth.login.LoginException;
 
 public class BasicAuthHttpListenerWrapper implements HttpListener {
-    private HttpListener httpListener;
-    private String realmName;
 
-    public BasicAuthHttpListenerWrapper(HttpListener httpListener, String realmName) {
+    private final HttpListener httpListener;
+    private final String realmName;
+
+    public BasicAuthHttpListenerWrapper(final HttpListener httpListener, final String realmName) {
         this.httpListener = httpListener;
         this.realmName = realmName;
     }
 
-    public void onMessage(HttpRequest request, HttpResponse response) throws Exception {
+    @Override
+    @SuppressWarnings("unchecked")
+    public void onMessage(final HttpRequest request, final HttpResponse response) throws Exception {
         Object token = null;
 
         String auth = request.getHeader("Authorization");
         if (auth != null && auth.length() > 0) {
             if (auth.toUpperCase().startsWith("BASIC ")) {
                 auth = auth.substring(6);
-                String decoded = new String(Base64.decodeBase64(auth.getBytes()));
-                String[] parts = decoded.split(":");
+                final String decoded = new String(Base64.decodeBase64(auth.getBytes()));
+                final String[] parts = decoded.split(":");
                 if (parts != null && parts.length == 2) {
-                    String username = parts[0];
-                    String password = parts[1];
+                    final String username = parts[0];
+                    final String password = parts[1];
 
                     try {
                         final SecurityService securityService = getSecurityService();
@@ -65,13 +68,12 @@ public class BasicAuthHttpListenerWrappe
         }
 
         if (token != null) {
-           getSecurityService().disassociate();
+            getSecurityService().disassociate();
         }
     }
 
     private SecurityService getSecurityService() {
-        final SecurityService securityService = SystemInstance.get().getComponent(SecurityService.class);
-        return securityService;
+        return SystemInstance.get().getComponent(SecurityService.class);
     }
 
 }