Author: manik.surtani(a)jboss.com Date: 2008-08-05 20:56:02 -0400 (Tue, 05 Aug 2008) New Revision: 6523 Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java Log: Null chk Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java 2008-08-05 23:01:18 UTC (rev 6522) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java 2008-08-06 00:56:02 UTC (rev 6523) @@ -1114,7 +1114,7 @@ if (ctx == null) ctx = invocationContextContainer.get(); ctx.setLocalRollbackOnly(localRollbackOnly); setTransactionalContext(tx, gtx, transactionContext, ctx); - ctx.setOptionOverrides(transactionalOptions); + if (transactionalOptions != null) ctx.setOptionOverrides(transactionalOptions); try { super.afterCompletion(status);