Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Partially revert the Javadoc changes to reintroduce the reference to … #46

Merged
merged 1 commit into from
Jul 18, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/src/main/java/javax/transaction/TransactionScoped.java
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
* will be thrown if an object with this annotation is used when the
* transaction context is not active.</p>
*
* @since 1.2
* @since JTA 1.2
*/
@Retention(java.lang.annotation.RetentionPolicy.RUNTIME)
@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
* implementing this interface can be looked up by a standard name via JNDI.
* The standard name is java:comp/TransactionSynchronizationRegistry.
*
* @since 1.1
* @since JTA 1.1
*/
public interface TransactionSynchronizationRegistry {

Expand Down Expand Up @@ -61,7 +61,7 @@ public interface TransactionSynchronizationRegistry {
* @return an opaque object representing the transaction bound to the
* current thread at the time this method is called.
*
* @since 1.1
* @since JTA 1.1
*/
Object getTransactionKey();

Expand All @@ -83,7 +83,7 @@ public interface TransactionSynchronizationRegistry {
* @exception IllegalStateException if no transaction is active.
* @exception NullPointerException if the parameter key is null.
*
* @since 1.1
* @since JTA 1.1
*/
void putResource(Object key, Object value);

Expand All @@ -104,7 +104,7 @@ public interface TransactionSynchronizationRegistry {
* @exception IllegalStateException if no transaction is active.
* @exception NullPointerException if the parameter key is null.
*
* @since 1.1
* @since JTA 1.1
*/
Object getResource(Object key);

Expand Down Expand Up @@ -143,7 +143,7 @@ public interface TransactionSynchronizationRegistry {
* @param sync the Synchronization instance.
* @exception IllegalStateException if no transaction is active.
*
* @since 1.1
* @since JTA 1.1
*/
void registerInterposedSynchronization(Synchronization sync);

Expand All @@ -157,7 +157,7 @@ public interface TransactionSynchronizationRegistry {
* @return the status of the transaction bound to the current thread
* at the time this method is called.
*
* @since 1.1
* @since JTA 1.1
*/
int getTransactionStatus();

Expand All @@ -167,7 +167,7 @@ public interface TransactionSynchronizationRegistry {
*
* @exception IllegalStateException if no transaction is active.
*
* @since 1.1
* @since JTA 1.1
*/
void setRollbackOnly();

Expand All @@ -178,7 +178,7 @@ public interface TransactionSynchronizationRegistry {
* @return the rollbackOnly status.
* @exception IllegalStateException if no transaction is active.
*
* @since 1.1
* @since JTA 1.1
*/
boolean getRollbackOnly();
}
2 changes: 1 addition & 1 deletion api/src/main/java/javax/transaction/Transactional.java
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
* <p>When a class is specified for either of these elements, the designated behavior applies to subclasses
* of that class as well. If both elements are specified, dontRollbackOn takes precedence.</p>
*
* @since 1.2
* @since JTA 1.2
*/
@Inherited
@InterceptorBinding
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
* Transactional(TxType.NEVER), the transaction begun by the first bean
* will be marked for rollback.
*
* @since 1.2
* @since JTA 1.2
*/
public class TransactionalException extends RuntimeException {
/**
Expand Down