- 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.)

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@386013 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Adrian T. Co 2006-03-15 09:26:12 +00:00
parent 687a45a516
commit a2fc7a2dc0
3 changed files with 2 additions and 9 deletions

View File

@ -29,7 +29,6 @@ import org.apache.activemq.transport.DefaultTransportListener;
import org.apache.activemq.transport.Transport; import org.apache.activemq.transport.Transport;
import org.apache.activemq.util.JMSExceptionSupport; import org.apache.activemq.util.JMSExceptionSupport;
import org.apache.activemq.util.ServiceSupport; 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.BlockingQueue;
import edu.emory.mathcs.backport.java.util.concurrent.LinkedBlockingQueue; import edu.emory.mathcs.backport.java.util.concurrent.LinkedBlockingQueue;
@ -75,7 +74,7 @@ public class StubConnection implements Service {
transport.setTransportListener(new DefaultTransportListener() { transport.setTransportListener(new DefaultTransportListener() {
public void onCommand(Command command) { public void onCommand(Command command) {
try { try {
if (command.getClass() == ShutdownCommand.class) { if (command.getClass() == ShutdownInfo.class) {
shuttingDown = true; shuttingDown = true;
} }
StubConnection.this.dispatch(command); StubConnection.this.dispatch(command);

View File

@ -192,15 +192,9 @@
</includes> </includes>
<excludes> <excludes>
<!-- http://jira.activemq.org/jira/browse/AMQ-628 -->
<exclude>**/HttpTransportBrokerTest.*</exclude>
<!-- http://jira.activemq.org/jira/browse/AMQ-629 --> <!-- http://jira.activemq.org/jira/browse/AMQ-629 -->
<exclude>**/SslTransportBrokerTest.*</exclude> <exclude>**/SslTransportBrokerTest.*</exclude>
<!-- http://jira.activemq.org/jira/browse/AMQ-631 -->
<exclude>**/HttpsTransportBrokerTest.*</exclude>
</excludes> </excludes>
</unitTest> </unitTest>

View File

@ -100,7 +100,7 @@ public class HttpTransport extends HttpTransportSupport {
} }
catch (Exception e) { catch (Exception e) {
if (!isStopped()) { 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 { else {
log.trace("Caught error after closed: " + e, e); log.trace("Caught error after closed: " + e, e);