You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2013/09/12 09:15:41 UTC
svn commit: r1522464 - in /tomee/tomee/trunk/server/openejb-http/src:
main/java/org/apache/openejb/server/httpd/
test/java/org/apache/openejb/server/httpd/
Author: rmannibucau
Date: Thu Sep 12 07:15:41 2013
New Revision: 1522464
URL: http://svn.apache.org/r1522464
Log:
TOMEE-1028 creating session in openejb-http only when needed
Added:
tomee/tomee/trunk/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/HttpResponseImplSessionTest.java
Modified:
tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java
tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java
Modified: tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java?rev=1522464&r1=1522463&r2=1522464&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java (original)
+++ tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java Thu Sep 12 07:15:41 2013
@@ -359,7 +359,7 @@ public class HttpRequestImpl implements
if (log.isDebugEnabled()) {
final StringBuilder builder = new StringBuilder();
builder.append("******************* REQUEST ******************\n");
- builder.append(method + " " + uri).append("\n");
+ builder.append(method).append(" ").append(uri).append("\n");
for (Map.Entry<String, String> entry : headers.entrySet()) {
builder.append(entry).append("\n");
}
Modified: tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java?rev=1522464&r1=1522463&r2=1522464&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java (original)
+++ tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java Thu Sep 12 07:15:41 2013
@@ -383,16 +383,8 @@ public class HttpResponseImpl implements
* HTTP/1.1 200 OK
* @return the string value of this HttpResponseImpl
*/
- public String toString(){
- StringBuffer buf = new StringBuffer(40);
-
- buf.append(HTTP_VERSION);
- buf.append(SP);
- buf.append(code);
- buf.append(SP);
- buf.append(responseString);
-
- return buf.toString();
+ public String toString() {
+ return HTTP_VERSION + SP + code + SP + responseString;
}
/** closes the message sent to the browser
@@ -415,19 +407,16 @@ public class HttpResponseImpl implements
}
private void setCookieHeader() {
- if (request == null || request.getSession() == null) return;
-
- HttpSession session = request.getSession(false);
-
- if (session == null) return;
+ if (request == null) {
+ return;
+ }
- StringBuffer cookie = new StringBuffer();
- cookie.append(HttpRequestImpl.EJBSESSIONID);
- cookie.append('=');
- cookie.append(session.getId());
- cookie.append("; Path=/");
+ final HttpSession session = request.getSession(false);
+ if (session == null) {
+ return;
+ }
- headers.put(HttpRequest.HEADER_SET_COOKIE, cookie.toString());
+ headers.put(HttpRequest.HEADER_SET_COOKIE, HttpRequestImpl.EJBSESSIONID + '=' + session.getId() + "; Path=/");
}
/** Writes a response line similar to this:
@@ -452,7 +441,7 @@ public class HttpResponseImpl implements
* @throws java.io.IOException if an exception is thrown
*/
private void writeHeaders(DataOutput out) throws IOException{
- for (Map.Entry<String, String> entry : headers.entrySet()) {
+ for (final Map.Entry<String, String> entry : headers.entrySet()) {
out.writeBytes(""+entry.getKey());
out.writeBytes(CSP);
out.writeBytes(""+entry.getValue());
Added: tomee/tomee/trunk/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/HttpResponseImplSessionTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/HttpResponseImplSessionTest.java?rev=1522464&view=auto
==============================================================================
--- tomee/tomee/trunk/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/HttpResponseImplSessionTest.java (added)
+++ tomee/tomee/trunk/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/HttpResponseImplSessionTest.java Thu Sep 12 07:15:41 2013
@@ -0,0 +1,154 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.server.httpd;
+
+import org.apache.openejb.core.CoreContainerSystem;
+import org.apache.openejb.core.ivm.naming.IvmJndiFactory;
+import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.server.ServiceException;
+import org.apache.openejb.spi.ContainerSystem;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import javax.servlet.http.HttpSession;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.reflect.Field;
+import java.net.Socket;
+import java.util.Map;
+import java.util.Properties;
+import java.util.concurrent.atomic.AtomicReference;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class HttpResponseImplSessionTest {
+ private static Field sessions;
+
+ private OpenEJBHttpEjbServer server;
+
+ @BeforeClass
+ public static void findSessionsField() throws NoSuchFieldException {
+ sessions = HttpRequestImpl.class.getDeclaredField("SESSIONS");
+ sessions.setAccessible(true);
+ }
+
+ private static int numberOfSessions() throws IllegalAccessException {
+ return Map.class.cast(sessions.get(null)).size();
+ }
+
+ @Before
+ public void start() throws Exception {
+ SystemInstance.get().setComponent(ContainerSystem.class, new CoreContainerSystem(new IvmJndiFactory()));
+
+ server = new OpenEJBHttpEjbServer();
+ server.init(new Properties());
+ server.start();
+ }
+
+ private String request(final InOutSocket socket) throws ServiceException, IOException {
+ server.service(socket);
+ return socket.out();
+ }
+
+ @After
+ public void stop() throws ServiceException {
+ server.stop();
+ SystemInstance.reset();
+ }
+
+ @Test
+ public void noSession() throws Exception {
+ final int numberOfSessionsBefore = numberOfSessions();
+ assertFalse(request(new InOutSocket().reset("GET /foo")).contains("Set-Cookie"));
+ assertEquals(numberOfSessionsBefore, numberOfSessions());
+ }
+
+ @Test
+ public void session() throws Exception {
+ final AtomicReference<Boolean> clearSession = new AtomicReference<Boolean>(false);
+
+ SystemInstance.get().getComponent(HttpListenerRegistry.class).addHttpListener(new HttpListener() {
+ @Override
+ public void onMessage(final HttpRequest request, final HttpResponse response) throws Exception {
+ final HttpSession session = request.getSession(true);
+ if (clearSession.get()) {
+ session.invalidate();
+ }
+ }
+ }, "/session");
+
+ try {
+ final int numberOfSessions = numberOfSessions() + 1; // first request will create one
+ final InOutSocket socket = new InOutSocket();
+ String session = null;
+ for (int i = 0; i < 3; i++) {
+ String request = "GET /session";
+ if (session != null) {
+ request += "\nCookie: EJBSESSIONID=" + session + ";\n";
+ }
+ final String response = request(socket.reset(request));
+ assertTrue(response.contains("Set-Cookie"));
+
+ if (session == null) {
+ final int beginIndex = response.indexOf("EJBSESSIONID=") + "EJBSESSIONID=".length();
+ session = response.substring(beginIndex, response.indexOf(";", beginIndex));
+ }
+
+ assertEquals(numberOfSessions, numberOfSessions());
+ }
+
+ clearSession.set(true);
+ request(socket.reset("GET /session\nCookie: EJBSESSIONID=" + session + ";\n"));
+ assertEquals(numberOfSessions - 1, numberOfSessions());
+ } finally {
+ SystemInstance.get().getComponent(HttpListenerRegistry.class).removeHttpListener("/session");
+ }
+ }
+
+ private static class InOutSocket extends Socket {
+ private ByteArrayInputStream inputStream;
+ private ByteArrayOutputStream outputStream;
+
+ @Override
+ public InputStream getInputStream() throws IOException {
+ return inputStream;
+ }
+
+ @Override
+ public OutputStream getOutputStream() throws IOException {
+ return outputStream;
+ }
+
+ public InOutSocket reset(final String input) {
+ inputStream = new ByteArrayInputStream(input.getBytes());
+ outputStream = new ByteArrayOutputStream();
+ return this;
+ }
+
+ public String out() {
+ return new String(outputStream.toByteArray());
+ }
+ }
+}