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 2016/08/16 08:22:01 UTC
[1/2] tomee git commit: TOMEE-1905 AMQ 5.14.0
Repository: tomee
Updated Branches:
refs/heads/master c732d2fdd -> c5baa83f0
TOMEE-1905 AMQ 5.14.0
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/73d16263
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/73d16263
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/73d16263
Branch: refs/heads/master
Commit: 73d1626375d74d540f10b97a0359633d6e0026e3
Parents: c732d2f
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Tue Aug 16 09:56:55 2016 +0200
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Tue Aug 16 09:56:55 2016 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/73d16263/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ea385ac..4b9ef99 100644
--- a/pom.xml
+++ b/pom.xml
@@ -162,7 +162,7 @@
<commons-net.version>3.3</commons-net.version>
<bval.version>1.1.1</bval.version>
- <org.apache.activemq.version>5.13.3</org.apache.activemq.version>
+ <org.apache.activemq.version>5.14.0</org.apache.activemq.version>
<org.springframework.version>3.1.4.RELEASE</org.springframework.version>
<junit.version>4.12</junit.version>
<org.apache.axis2.version>1.4.1</org.apache.axis2.version>
[2/2] tomee git commit: TOMEE-1906 cxf 3.1.7
Posted by rm...@apache.org.
TOMEE-1906 cxf 3.1.7
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/c5baa83f
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/c5baa83f
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/c5baa83f
Branch: refs/heads/master
Commit: c5baa83f0a7a19a5e6c789e24852757e1d64b776
Parents: 73d1626
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Tue Aug 16 10:21:53 2016 +0200
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Tue Aug 16 10:21:53 2016 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
.../openejb/server/cxf/rs/SuspendedTest.java | 37 ++++++++++++--------
.../openejb/server/httpd/HttpRequestImpl.java | 2 +-
.../openejb/server/httpd/OpenEJBHttpServer.java | 17 ++++-----
4 files changed, 33 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/c5baa83f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4b9ef99..8fc87f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,7 +129,7 @@
<tomcat.version>8.5.4</tomcat.version>
- <cxf.version>3.1.6</cxf.version>
+ <cxf.version>3.1.7</cxf.version>
<ehcache.version>2.9.0</ehcache.version>
<!-- used by cxf for security (replay attack) -->
<jetty.version>7.5.3.v20111011</jetty.version>
http://git-wip-us.apache.org/repos/asf/tomee/blob/c5baa83f/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SuspendedTest.java
----------------------------------------------------------------------
diff --git a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SuspendedTest.java b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SuspendedTest.java
index 8b55222..bf2825f 100644
--- a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SuspendedTest.java
+++ b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SuspendedTest.java
@@ -42,8 +42,10 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.concurrent.atomic.AtomicReference;
+import static java.util.concurrent.TimeUnit.MINUTES;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@EnableServices("jaxrs")
@@ -64,19 +66,21 @@ public class SuspendedTest {
private ManagedExecutorService es;
@GET
- public String async(@Suspended final AsyncResponse response) {
+ public void async(@Suspended final AsyncResponse response) {
if (current == null) {
- asyncPath = es.submit(new Callable<String>() {
- @Override
- public String call() throws Exception {
- final String path = info.getPath();
- assertNotNull(path);
- return path;
- }
- });
- current = response;
- LATCH.countDown();
- return "ignored";
+ try {
+ asyncPath = es.submit(new Callable<String>() {
+ @Override
+ public String call() throws Exception {
+ final String path = info.getPath();
+ assertNotNull(path);
+ return path;
+ }
+ });
+ current = response;
+ } finally {
+ LATCH.countDown();
+ }
} else {
throw new IllegalStateException("we shouldnt go here back since");
}
@@ -111,11 +115,14 @@ public class SuspendedTest {
new Thread() {
@Override
public void run() {
- response.set(WebClient.create(url.toExternalForm() + "openejb/touch").get());
- end.countDown();
+ try {
+ response.set(WebClient.create(url.toExternalForm() + "openejb/touch").get());
+ } finally {
+ end.countDown();
+ }
}
}.start();
- Endpoint.LATCH.await();
+ assertTrue(Endpoint.LATCH.await(1, MINUTES));
WebClient.create(url.toExternalForm() + "openejb/touch").path("answer").post("hello");
end.await();
assertEquals("hello", response.get().readEntity(String.class));
http://git-wip-us.apache.org/repos/asf/tomee/blob/c5baa83f/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java
----------------------------------------------------------------------
diff --git a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java
index e278c23..129a4d7 100644
--- a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java
+++ b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java
@@ -254,7 +254,7 @@ public class HttpRequestImpl implements HttpRequest {
return null;
}
if (servletPath != null) {
- return path.substring(servletPath.length());
+ return path.length() < servletPath.length() ? "" : path.substring(servletPath.length());
}
return path;
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/c5baa83f/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBHttpServer.java
----------------------------------------------------------------------
diff --git a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBHttpServer.java b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBHttpServer.java
index 2290884..6f480c5 100644
--- a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBHttpServer.java
+++ b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBHttpServer.java
@@ -29,6 +29,12 @@ import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
import org.apache.openejb.util.OptionsLog;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -40,12 +46,6 @@ import java.net.URI;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
/**
* This is the main class for the web administration. It takes care of the
@@ -209,7 +209,8 @@ public class OpenEJBHttpServer implements HttpServer {
try {
response = process(socket, socketURI, in);
return response != null;
- } catch (Throwable t) {
+ } catch (final Throwable t) {
+ log.error(t.getMessage(), t);
response = HttpResponseImpl.createError(t.getMessage(), t);
return true;
} finally {
@@ -220,7 +221,7 @@ public class OpenEJBHttpServer implements HttpServer {
response.writeMessage(new LoggerOutputStream(log, "debug"), indent);
}
}
- } catch (Throwable t2) {
+ } catch (final Throwable t2) {
if (log.isDebugEnabled()) {
log.debug("Could not write response", t2);