svn commit: r1398762 - /openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/ApplicationSocketConnection.java

[tveronezi]

Author: tveronezi
Date: Tue Oct 16 12:37:50 2012
New Revision: 1398762

URL: http://svn.apache.org/viewvc?rev=1398762&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-448

Modified:
    
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/ApplicationSocketConnection.java

Modified: 
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/ApplicationSocketConnection.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/ApplicationSocketConnection.java?rev=1398762&r1=1398761&r2=1398762&view=diff
==============================================================================
--- 
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/ApplicationSocketConnection.java
 (original)
+++ 
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/ApplicationSocketConnection.java
 Tue Oct 16 12:37:50 2012
@@ -40,8 +40,7 @@ public class ApplicationSocketConnection
     private Gson gson = new Gson();
     private Map<String, Object> attributes = new HashMap<String, Object>();
 
-    private String user;
-    private String pass;
+    private Context context;
 
     private String readParam(Reader in) throws IOException {
 
@@ -88,31 +87,21 @@ public class ApplicationSocketConnection
         props.setProperty(Context.SECURITY_CREDENTIALS, pass);
         try {
             final Context context = new InitialContext(props);
-            this.user = user;
-            this.pass = pass;
-            return context;
+            this.context = context;
         } catch (NamingException e) {
-            this.user = null;
-            this.pass = null;
-            return null;
+            this.context = null;
         }
+        return context;
     }
 
     @Override
     public void assertAuthenticated() throws UserNotAuthenticated {
-        final Context context = this.login(this.user, this.pass);
-        if (context == null) {
-            throw new UserNotAuthenticated();
-        }
-
-        final User user;
-        try {
-            user = (User) context.lookup("openejb/UserBusinessRemote");
-        } catch (NamingException e) {
+        if (this.context == null) {
             throw new UserNotAuthenticated();
         }
 
         try {
+            final User user = (User) 
this.context.lookup("openejb/UserBusinessRemote");
             user.adminOnly();
         } catch (Exception e) {
             throw new UserNotAuthenticated(e);