Author: aco
Date: Wed Mar 15 01:26:12 2006
New Revision: 386013
URL: http://svn.apache.org/viewcvs?rev=386013&view=rev
Log:
- Fix error in stub connection to prevent HttpTransportBrokerTest to hang.
- Enabled test cases. (This is passing for me now, both in maven and in my IDE.
Have to see how it does in the boxes.)
- Increase the logging level to error in HttpTransport. (Exceptions could be
critical in that section. Better informed i guess.)
- Just a note: HttpsTransportBrokerTest takes around 13mins in my machine to
run. (It could be too long for a test case. 137 test cases * 5 secs to setup
jetty each time + actual processing time.)
Modified:
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/StubConnection.java
incubator/activemq/trunk/activemq-optional/project.xml
incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransport.java
Modified:
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/StubConnection.java
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/StubConnection.java?rev=386013&r1=386012&r2=386013&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/StubConnection.java
(original)
+++
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/StubConnection.java
Wed Mar 15 01:26:12 2006
@@ -29,7 +29,6 @@
import org.apache.activemq.transport.Transport;
import org.apache.activemq.util.JMSExceptionSupport;
import org.apache.activemq.util.ServiceSupport;
-import org.axiondb.engine.commands.ShutdownCommand;
import edu.emory.mathcs.backport.java.util.concurrent.BlockingQueue;
import edu.emory.mathcs.backport.java.util.concurrent.LinkedBlockingQueue;
@@ -75,7 +74,7 @@
transport.setTransportListener(new DefaultTransportListener() {
public void onCommand(Command command) {
try {
- if (command.getClass() == ShutdownCommand.class) {
+ if (command.getClass() == ShutdownInfo.class) {
shuttingDown = true;
}
StubConnection.this.dispatch(command);
Modified: incubator/activemq/trunk/activemq-optional/project.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-optional/project.xml?rev=386013&r1=386012&r2=386013&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-optional/project.xml (original)
+++ incubator/activemq/trunk/activemq-optional/project.xml Wed Mar 15 01:26:12
2006
@@ -192,14 +192,8 @@
</includes>
<excludes>
- <!-- http://jira.activemq.org/jira/browse/AMQ-628 -->
- <exclude>**/HttpTransportBrokerTest.*</exclude>
-
<!-- http://jira.activemq.org/jira/browse/AMQ-629 -->
<exclude>**/SslTransportBrokerTest.*</exclude>
-
- <!-- http://jira.activemq.org/jira/browse/AMQ-631 -->
- <exclude>**/HttpsTransportBrokerTest.*</exclude>
</excludes>
</unitTest>
Modified:
incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransport.java
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransport.java?rev=386013&r1=386012&r2=386013&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransport.java
(original)
+++
incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransport.java
Wed Mar 15 01:26:12 2006
@@ -100,7 +100,7 @@
}
catch (Exception e) {
if (!isStopped()) {
- log.warn("Failed to perform GET on: " + remoteUrl + " due
to: " + e, e);
+ log.error("Failed to perform GET on: " + remoteUrl + " due
to: " + e, e);
}
else {
log.trace("Caught error after closed: " + e, e);
