Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-591 Fixing typos

This commit is contained in:
Clebert Suconic 2016-08-15 22:01:46 -04:00
parent b3a8327ab7
commit ad21b5b70b
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQExceptionType.java
View File

@ -154,12 +154,6 @@ public enum ActiveMQExceptionType {
return new ActiveMQTransactionOutcomeUnknownException(msg);
}
},
TRANSACTION_TIMEOUT(116) {
@Override
public ActiveMQException createException(String msg) {
return new ActiveMQTranasactionTimeoutException(msg);
}
},
ALREADY_REPLICATING(116) {
@Override
public ActiveMQException createException(String msg) {
@ -184,7 +178,12 @@ public enum ActiveMQExceptionType {
return new ActiveMQRemoteDisconnectException(msg);
}
},
TRANSACTION_TIMEOUT(120) {
@Override
public ActiveMQException createException(String msg) {
return new ActiveMQTransactionTimeoutException(msg);
}
},
GENERIC_EXCEPTION(999),
NATIVE_ERROR_INTERNAL(200),
NATIVE_ERROR_INVALID_BUFFER(201),

6
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQTranasactionTimeoutException.java → artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQTransactionTimeoutException.java
View File

@ -17,13 +17,13 @@
package org.apache.activemq.artemis.api.core;
public class ActiveMQTranasactionTimeoutException extends ActiveMQException {
public class ActiveMQTransactionTimeoutException extends ActiveMQException {
public ActiveMQTranasactionTimeoutException() {
public ActiveMQTransactionTimeoutException() {
super(ActiveMQExceptionType.TRANSACTION_TIMEOUT);
}
public ActiveMQTranasactionTimeoutException(String message) {
public ActiveMQTransactionTimeoutException(String message) {
super(ActiveMQExceptionType.TRANSACTION_TIMEOUT, message);
}
}

6
artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/impl/TransactionImpl.java
View File

@ -25,7 +25,7 @@ import java.util.List;
import org.apache.activemq.artemis.api.core.ActiveMQException;
import org.apache.activemq.artemis.api.core.ActiveMQExceptionType;
import org.apache.activemq.artemis.api.core.ActiveMQIllegalStateException;
import org.apache.activemq.artemis.api.core.ActiveMQTranasactionTimeoutException;
import org.apache.activemq.artemis.api.core.ActiveMQTransactionTimeoutException;
import org.apache.activemq.artemis.core.io.IOCallback;
import org.apache.activemq.artemis.core.persistence.StorageManager;
import org.apache.activemq.artemis.core.server.ActiveMQServerLogger;
@ -171,7 +171,7 @@ public class TransactionImpl implements Transaction {
}
if (timedout) {
markAsRollbackOnly(new ActiveMQTranasactionTimeoutException());
markAsRollbackOnly(new ActiveMQTransactionTimeoutException());
}
return timedout;
@ -180,7 +180,7 @@ public class TransactionImpl implements Transaction {
@Override
public boolean hasTimedOut() {
return state == State.ROLLBACK_ONLY && exception.getType() == ActiveMQExceptionType.TRANSACTION_TIMEOUT;
return state == State.ROLLBACK_ONLY && exception != null && exception.getType() == ActiveMQExceptionType.TRANSACTION_TIMEOUT;
}
@Override