Menu
▾
▴
[openorb-commits] CVS: TransactionService/src/main/org/openorb/ots/Impl Control.java,1.5,1.6 Current.java,1.5,1.6 PseudoControl.java,1.4,1.5 RecoveryCoordinator.java,1.5,1.6 RecoveryManager.java,1.5,1.6 SubCoordinator.java,1.6,1.7 SubTransCoordinator.java,1.4,1.5 SubTransListener.java,1.6,1.7 SubTransTerminator.java,1.6,1.7 TimeOutControl.java,1.4,1.5 TransactionFactory.java,1.4,1.5 XID.java,1.5,1.6
|
From: Michael R. <mr...@us...> - 2002-08-30 10:08:09
|
Update of /cvsroot/openorb/TransactionService/src/main/org/openorb/ots/Impl
In directory usw-pr-cvs1:/tmp/cvs-serv3611/src/main/org/openorb/ots/Impl
Modified Files:
Control.java Current.java PseudoControl.java
RecoveryCoordinator.java RecoveryManager.java
SubCoordinator.java SubTransCoordinator.java
SubTransListener.java SubTransTerminator.java
TimeOutControl.java TransactionFactory.java XID.java
Log Message:
Checkstyle cleanups...
Index: Control.java
===================================================================
RCS file: /cvsroot/openorb/TransactionService/src/main/org/openorb/ots/Impl/Control.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Control.java 29 Aug 2002 12:55:52 -0000 1.5
+++ Control.java 30 Aug 2002 10:07:33 -0000 1.6
@@ -19,18 +19,24 @@
/**
* Reference to the terminator
*/
- private org.omg.CosTransactions.Terminator _terminator;
-
- public org.openorb.ots.Impl.SubTransTerminator _sub_terminator_impl;
+ private org.omg.CosTransactions.Terminator m_terminator;
+ private org.openorb.ots.Impl.SubTransTerminator m_sub_terminator_impl;
+ public org.openorb.ots.Impl.SubTransTerminator getSubTransTerminator()
+ {
+ return m_sub_terminator_impl;
+ }
/**
* Reference to the coordinator
*/
- private org.omg.CosTransactions.Coordinator _coordinator;
-
- public org.openorb.ots.Impl.Coordinator _coordinator_impl;
+ private org.omg.CosTransactions.Coordinator m_coordinator;
+ private org.openorb.ots.Impl.Coordinator m_coordinator_impl;
+ public org.openorb.ots.Impl.Coordinator getCoordinator()
+ {
+ return m_coordinator_impl;
+ }
- private org.omg.PortableServer.POA _poa;
+ private org.omg.PortableServer.POA m_poa;
/**
* Constructor
@@ -42,7 +48,7 @@
org.omg.PortableServer.POA recovery_poa )
{
org.openorb.ots.Impl.Terminator _terminator_impl = null;
- _poa = poa;
+ m_poa = poa;
try
{
@@ -53,34 +59,34 @@
{
org.openorb.ots.Impl.XID xid = new org.openorb.ots.Impl.XID();
- _coordinator_impl = new org.openorb.ots.Impl.Coordinator( xid, time_out, poa, recovery_poa );
+ m_coordinator_impl = new org.openorb.ots.Impl.Coordinator( xid, time_out, poa, recovery_poa );
- _terminator_impl = new org.openorb.ots.Impl.Terminator( poa, _coordinator_impl );
+ _terminator_impl = new org.openorb.ots.Impl.Terminator( poa, m_coordinator_impl );
}
else
{
org.openorb.ots.Impl.XID xid = new org.openorb.ots.Impl.XID( ctx, true );
- _coordinator_impl = new org.openorb.ots.Impl.SubCoordinator( xid, time_out, ctx.current.coord, poa, recovery_poa );
+ m_coordinator_impl = new org.openorb.ots.Impl.SubCoordinator( xid, time_out, ctx.current.coord, poa, recovery_poa );
- _terminator = null;
+ m_terminator = null;
}
//
// Activate coordinator and terminator
//
- byte [] id = poa.activate_object( _coordinator_impl );
+ byte [] id = poa.activate_object( m_coordinator_impl );
- _coordinator = org.omg.CosTransactions.CoordinatorHelper.narrow( poa.id_to_reference( id ) );
+ m_coordinator = org.omg.CosTransactions.CoordinatorHelper.narrow( poa.id_to_reference( id ) );
if ( _terminator_impl != null )
{
id = poa.activate_object( _terminator_impl );
- _terminator = org.omg.CosTransactions.TerminatorHelper.narrow( poa.id_to_reference( id ) );
+ m_terminator = org.omg.CosTransactions.TerminatorHelper.narrow( poa.id_to_reference( id ) );
}
- _coordinator_impl.setTerminator( _terminator );
+ m_coordinator_impl.setTerminator( m_terminator );
}
catch ( java.lang.Exception ex )
{
@@ -90,7 +96,7 @@
//
// Then launch a time out control ( if time out != 0 ) if this coordinator is not a sub coordinator
//
- if ( ( time_out != 0 ) && ( _terminator != null ) )
+ if ( ( time_out != 0 ) && ( m_terminator != null ) )
{
org.openorb.ots.Impl.TimeOutControl control = new org.openorb.ots.Impl.TimeOutControl( _terminator_impl, time_out );
@@ -105,7 +111,7 @@
*/
public Control( int time_out, org.openorb.ots.Impl.XID parent_xid, org.omg.PortableServer.POA poa, org.omg.CosTransactions.TransIdentity [] parents )
{
- _poa = poa;
+ m_poa = poa;
try
{
@@ -117,22 +123,22 @@
//
// Create coordinator and terminator
//
- _coordinator_impl = new org.openorb.ots.Impl.SubTransCoordinator( time_out, xid, parents, poa );
+ m_coordinator_impl = new org.openorb.ots.Impl.SubTransCoordinator( time_out, xid, parents, poa );
- _sub_terminator_impl = new org.openorb.ots.Impl.SubTransTerminator( poa, _coordinator_impl );
+ m_sub_terminator_impl = new org.openorb.ots.Impl.SubTransTerminator( poa, m_coordinator_impl );
//
// Activate coordinator and terminator
//
- byte [] id = poa.activate_object( _coordinator_impl );
+ byte [] id = poa.activate_object( m_coordinator_impl );
- _coordinator = org.omg.CosTransactions.CoordinatorHelper.narrow( poa.id_to_reference( id ) );
+ m_coordinator = org.omg.CosTransactions.CoordinatorHelper.narrow( poa.id_to_reference( id ) );
- id = poa.activate_object( _sub_terminator_impl );
+ id = poa.activate_object( m_sub_terminator_impl );
- _terminator = org.omg.CosTransactions.TerminatorHelper.narrow( poa.id_to_reference( id ) );
+ m_terminator = org.omg.CosTransactions.TerminatorHelper.narrow( poa.id_to_reference( id ) );
- _coordinator_impl.setTerminator( _terminator );
+ m_coordinator_impl.setTerminator( m_terminator );
}
catch ( java.lang.Exception ex )
{
@@ -151,12 +157,12 @@
* cannot provide the requested object.
*/
public org.omg.CosTransactions.Terminator get_terminator()
- throws org.omg.CosTransactions.Unavailable
+ throws org.omg.CosTransactions.Unavailable
{
- if ( _terminator == null )
+ if ( m_terminator == null )
throw new org.omg.CosTransactions.Unavailable();
- return _terminator;
+ return m_terminator;
}
/**
@@ -170,9 +176,9 @@
* the requested object.
*/
public org.omg.CosTransactions.Coordinator get_coordinator()
- throws org.omg.CosTransactions.Unavailable
+ throws org.omg.CosTransactions.Unavailable
{
- return _coordinator;
+ return m_coordinator;
}
/**
@@ -181,7 +187,7 @@
*/
public void update()
{
- _coordinator_impl.updatePropagationContext( this );
+ m_coordinator_impl.updatePropagationContext( this );
}
/**
@@ -190,12 +196,11 @@
public void removeItself()
{
// Remove itself from the managed control object list
- org.openorb.ots.Admin.Manager._controls.removeElement( this );
-
+ org.openorb.ots.Admin.Manager.m_controls.removeElement( this );
try
{
// Remove the control
- _poa.deactivate_object( _poa.servant_to_id( this ) );
+ m_poa.deactivate_object( m_poa.servant_to_id( this ) );
}
catch ( org.omg.PortableServer.POAPackage.ObjectNotActive ex )
{
Index: Current.java
===================================================================
RCS file: /cvsroot/openorb/TransactionService/src/main/org/openorb/ots/Impl/Current.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Current.java 29 Aug 2002 12:55:52 -0000 1.5
+++ Current.java 30 Aug 2002 10:07:33 -0000 1.6
@@ -589,9 +589,9 @@
org.openorb.ots.xa.XABag _xa_bag = getXABag( pctx );
- if ( _xa_bag._xa_coordinator == null )
+ if ( _xa_bag.fXACoordinator == null )
{
- _xa_bag._xa_coordinator = new org.openorb.ots.xa.XACoordinator( new org.openorb.ots.Impl.XID( pctx, false ), pctx.current.coord, this, _info );
+ _xa_bag.fXACoordinator = new org.openorb.ots.xa.XACoordinator( new org.openorb.ots.Impl.XID( pctx, false ), pctx.current.coord, this, _info );
org.omg.PortableServer.POA rootPOA = null;
@@ -610,7 +610,7 @@
try
{
- byte [] id = rootPOA.activate_object( _xa_bag._xa_coordinator );
+ byte [] id = rootPOA.activate_object( _xa_bag.fXACoordinator );
res = org.omg.CosTransactions.ResourceHelper.narrow( rootPOA.id_to_reference( id ) );
pctx.current.coord.register_resource( res );
}
@@ -620,7 +620,7 @@
throw new org.omg.CORBA.INTERNAL();
}
}
- _xa_bag._xa_coordinator.registerXAResource( resource );
+ _xa_bag.fXACoordinator.registerXAResource( resource );
}
/**
@@ -631,7 +631,7 @@
{
org.openorb.ots.xa.XABag _xa_bag = getXABagFromCoordinator( xacoord );
- if ( _xa_bag._xa_coordinator == null )
+ if ( _xa_bag.fXACoordinator == null )
return ;
org.omg.PortableServer.POA rootPOA = null;
@@ -649,7 +649,7 @@
try
{
- byte [] id = rootPOA.servant_to_id( _xa_bag._xa_coordinator );
+ byte [] id = rootPOA.servant_to_id( _xa_bag.fXACoordinator );
rootPOA.deactivate_object( id );
}
@@ -660,7 +660,7 @@
throw new org.omg.CORBA.INTERNAL();
}
- _xa_bag._xa_coordinator = null;
+ _xa_bag.fXACoordinator = null;
}
/**
@@ -672,9 +672,9 @@
try
{
- if ( _xa_bag._xa_coordinator != null )
+ if ( _xa_bag.fXACoordinator != null )
{
- _xa_bag._xa_coordinator.endXAResource( xa_connection.getXAResource(), success );
+ _xa_bag.fXACoordinator.endXAResource( xa_connection.getXAResource(), success );
}
}
catch ( java.sql.SQLException ex )
@@ -723,9 +723,9 @@
{
org.openorb.ots.xa.XABag bag = ( org.openorb.ots.xa.XABag ) enum.nextElement();
- if ( bag._xa_coordinator != null )
+ if ( bag.fXACoordinator != null )
{
- if ( bag._xa_coordinator.equals( coord ) )
+ if ( bag.fXACoordinator.equals( coord ) )
return bag;
}
}
Index: PseudoControl.java
===================================================================
RCS file: /cvsroot/openorb/TransactionService/src/main/org/openorb/ots/Impl/PseudoControl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- PseudoControl.java 21 Aug 2002 08:28:16 -0000 1.4
+++ PseudoControl.java 30 Aug 2002 10:07:33 -0000 1.5
@@ -9,51 +9,53 @@
package org.openorb.ots.Impl;
/**
- * This object is used to provide a pseudo control object. On the client and server sides, the control object cannot be
- * found ( since its reference is not set in the propagation context ). However, this object only provides two accessors to
- * get the coordinator and the terminator. These objects reference are set in the propagation context, so it is possible
- * to simulate the original control object.
+ * This object is used to provide a pseudo control object. On the client and server sides, the
+ * control object cannot be found ( since its reference is not set in the propagation context ).
+ * However, this object only provides two accessors to get the coordinator and the terminator.
+ * These objects reference are set in the propagation context, so it is possible to simulate
+ * the original control object.
*
* @author Jerome Daniel
*/
public class PseudoControl
- extends org.omg.CORBA.LocalObject
- implements org.omg.CosTransactions.Control
+ extends org.omg.CORBA.LocalObject
+ implements org.omg.CosTransactions.Control
{
/**
* Reference to the coordinator
*/
- private org.omg.CosTransactions.Coordinator _coord;
+ private org.omg.CosTransactions.Coordinator m_coordinator;
/**
* Reference to the terminator
*/
- private org.omg.CosTransactions.Terminator _term;
+ private org.omg.CosTransactions.Terminator m_terminator;
/**
* Constructor. The parameters are the coordinator and terminator references.
*/
- public PseudoControl( org.omg.CosTransactions.Coordinator coord, org.omg.CosTransactions.Terminator term )
+ public PseudoControl( org.omg.CosTransactions.Coordinator coord,
+ org.omg.CosTransactions.Terminator term )
{
- _coord = coord;
- _term = term;
+ m_coordinator = coord;
+ m_terminator = term;
}
/**
* Return the terminator
*/
public org.omg.CosTransactions.Terminator get_terminator()
- throws org.omg.CosTransactions.Unavailable
+ throws org.omg.CosTransactions.Unavailable
{
- return _term;
+ return m_terminator;
}
/**
* Return the coordinator
*/
public org.omg.CosTransactions.Coordinator get_coordinator()
- throws org.omg.CosTransactions.Unavailable
+ throws org.omg.CosTransactions.Unavailable
{
- return _coord;
+ return m_coordinator;
}
}
Index: RecoveryCoordinator.java
===================================================================
RCS file: /cvsroot/openorb/TransactionService/src/main/org/openorb/ots/Impl/RecoveryCoordinator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- RecoveryCoordinator.java 21 Aug 2002 08:28:16 -0000 1.5
+++ RecoveryCoordinator.java 30 Aug 2002 10:07:33 -0000 1.6
@@ -13,35 +13,36 @@
*
* @author Jerome Daniel
*/
-public class RecoveryCoordinator extends org.omg.CosTransactions.RecoveryCoordinatorPOA
+public class RecoveryCoordinator
+ extends org.omg.CosTransactions.RecoveryCoordinatorPOA
{
/**
* Reference to the log monitor
*/
- private org.openorb.ots.log.LogMonitor _monitor;
+ private org.openorb.ots.log.LogMonitor m_monitor;
/**
* Constructor
*/
public RecoveryCoordinator( org.omg.CORBA.ORB orb )
{
- _monitor = new org.openorb.ots.log.LogMonitor( orb );
+ m_monitor = new org.openorb.ots.log.LogMonitor( orb );
}
/**
* This operation can be invoked at any time after the associated resource has been
* prepared. The Resource must be passed as the parameter. Performing this operation
* provides a hint to the Coordinator that the commit or rollback operations have not been
- * performed on the resource. This hint may be required in certain failure cases. This non-blocking
- * operation returns the current status of the transaction. The NotPrepared
+ * performed on the resource. This hint may be required in certain failure cases. This non-
+ * blocking operation returns the current status of the transaction. The NotPrepared
* exception is raised if the resource has not been prepared.
*/
public org.omg.CosTransactions.Status replay_completion( org.omg.CosTransactions.Resource r )
- throws org.omg.CosTransactions.NotPrepared
+ throws org.omg.CosTransactions.NotPrepared
{
org.openorb.ots.Impl.XID xid = new org.openorb.ots.Impl.XID( _object_id() );
- org.omg.CosTransactions.Status status = _monitor.transaction_status( xid );
+ org.omg.CosTransactions.Status status = m_monitor.transaction_status( xid );
switch ( status.value() )
{
Index: RecoveryManager.java
===================================================================
RCS file: /cvsroot/openorb/TransactionService/src/main/org/openorb/ots/Impl/RecoveryManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- RecoveryManager.java 29 Aug 2002 12:55:52 -0000 1.5
+++ RecoveryManager.java 30 Aug 2002 10:07:33 -0000 1.6
@@ -19,14 +19,14 @@
/**
* Reference to the log monitor
*/
- private org.openorb.ots.log.LogMonitor _monitor;
+ private org.openorb.ots.log.LogMonitor m_monitor;
/**
* Constructor
*/
public RecoveryManager( org.omg.CORBA.ORB orb )
{
- _monitor = new org.openorb.ots.log.LogMonitor( orb );
+ m_monitor = new org.openorb.ots.log.LogMonitor( orb );
}
/**
@@ -36,7 +36,7 @@
{
org.openorb.ots.Verbose.print( "RecoveryManager", "Begin transaction recovery" );
- org.openorb.ots.Impl.XID [] xids = _monitor.uncompleted_transactions();
+ org.openorb.ots.Impl.XID [] xids = m_monitor.uncompleted_transactions();
for ( int i = 0; i < xids.length; i++ )
{
@@ -52,10 +52,9 @@
*/
private void recover_this_transaction( org.openorb.ots.Impl.XID xid )
{
- org.openorb.ots.Verbose.print( "RecoveryManager", "Recover transaction : " + xid.toString() );
-
- org.omg.CosTransactions.Status status = _monitor.transaction_status( xid );
-
+ org.openorb.ots.Verbose.print( "RecoveryManager", "Recover transaction : "
+ + xid.toString() );
+ org.omg.CosTransactions.Status status = m_monitor.transaction_status( xid );
switch ( status.value() )
{
@@ -63,10 +62,12 @@
{
org.openorb.ots.Verbose.print( "RecoveryManager", "transaction not active" );
// Here, the transaction is begun. We have to rollback all registered resources.
- org.omg.CosTransactions.Resource [] resources = _monitor.registered_resources( xid );
+ org.omg.CosTransactions.Resource [] resources =
+ m_monitor.registered_resources( xid );
rollback_resources( xid, resources );
// Now, we log the transaction completion
- org.openorb.ots.log.Writer.out.rollback_end( xid, org.omg.CosTransactions.Status.StatusRolledBack );
+ org.openorb.ots.log.Writer.out.rollback_end( xid,
+ org.omg.CosTransactions.Status.StatusRolledBack );
org.openorb.ots.log.Writer.out.completed( xid );
}
@@ -77,12 +78,15 @@
org.openorb.ots.Verbose.print( "RecoveryManager", "transaction is preparing" );
// Here, the transaction is preparing. We have to rollback all prepared resources
// and all not rolledback ressources.
- org.omg.CosTransactions.Resource [] prepared_resources = _monitor.prepared_resources( xid );
+ org.omg.CosTransactions.Resource [] prepared_resources =
+ m_monitor.prepared_resources( xid );
rollback_resources( xid, prepared_resources );
- org.omg.CosTransactions.Resource [] free_resources = _monitor.free_resources( xid );
+ org.omg.CosTransactions.Resource [] free_resources =
+ m_monitor.free_resources( xid );
rollback_resources( xid, free_resources );
// Now, we log the transaction completion
- org.openorb.ots.log.Writer.out.rollback_end( xid, org.omg.CosTransactions.Status.StatusRolledBack );
+ org.openorb.ots.log.Writer.out.rollback_end( xid,
+ org.omg.CosTransactions.Status.StatusRolledBack );
org.openorb.ots.log.Writer.out.completed( xid );
}
@@ -91,9 +95,7 @@
case org.omg.CosTransactions.Status._StatusPrepared :
{
org.openorb.ots.Verbose.print( "RecoveryManager", "transaction is prepared" );
-
- org.omg.CosTransactions.Vote vote = _monitor.prepare_vote( xid );
-
+ org.omg.CosTransactions.Vote vote = m_monitor.prepare_vote( xid );
switch ( vote.value() )
{
@@ -101,30 +103,39 @@
{
org.openorb.ots.Verbose.print( "RecoveryManager", "Commit is voted" );
// Two possibilities !
- // 1. No rollback has been sent to resources. In this case, we continue to commit
+ // 1. No rollback has been sent to resources. In this case, we continue to
+ // commit
// 2. A rollback has been sent, and we have to continue rollback
- if ( _monitor.is_any_rollback( xid ) )
+ if ( m_monitor.is_any_rollback( xid ) )
{
- org.openorb.ots.Verbose.print( "RecoveryManager", "Must be rolledback" );
+ org.openorb.ots.Verbose.print( "RecoveryManager",
+ "Must be rolledback" );
// Case 2
- // Here, we have to rollback all prepared resources ( which are not already rolledback
- // and not committed but in this case the prepared_resources does not return them ).
- org.omg.CosTransactions.Resource [] prepared_resources = _monitor.prepared_resources( xid );
+ // Here, we have to rollback all prepared resources ( which are not
+ // already rolledback and not committed but in this case the
+ // prepared_resources does not return them ).
+ org.omg.CosTransactions.Resource [] prepared_resources =
+ m_monitor.prepared_resources( xid );
rollback_resources( xid, prepared_resources );
// Now, we log the transaction completion
- org.openorb.ots.log.Writer.out.rollback_end( xid, org.omg.CosTransactions.Status.StatusRolledBack );
+ org.openorb.ots.log.Writer.out.rollback_end( xid,
+ org.omg.CosTransactions.Status.StatusRolledBack );
org.openorb.ots.log.Writer.out.completed( xid );
}
else
{
org.openorb.ots.Verbose.print( "RecoveryManager", "Continue commit" );
// Case 1
- // Here, we have to rollback all prepared resources ( which are not already committed
- // but in this case the prepared_resources does not return them ).
- org.omg.CosTransactions.Resource [] prepared_resources = _monitor.prepared_resources( xid );
- org.omg.CosTransactions.Resource [] registered_resources = _monitor.registered_resources( xid );
+ // Here, we have to rollback all prepared resources ( which are not
+ // already committed but in this case the prepared_resources does not
+ // return them ).
+ org.omg.CosTransactions.Resource [] prepared_resources =
+ m_monitor.prepared_resources( xid );
+ org.omg.CosTransactions.Resource [] registered_resources =
+ m_monitor.registered_resources( xid );
- if ( ( prepared_resources.length == 1 ) && ( registered_resources.length == 1 ) )
+ if ( ( prepared_resources.length == 1 )
+ && ( registered_resources.length == 1 ) )
continue_commit_one_phase( xid, prepared_resources[ 0 ] );
else
continue_commit( xid, prepared_resources );
@@ -137,7 +148,8 @@
{
org.openorb.ots.Verbose.print( "RecoveryManager", "ReadOnly is voted" );
// Now, we log the transaction completion
- org.openorb.ots.log.Writer.out.commit_end( xid, org.omg.CosTransactions.Status.StatusCommitted );
+ org.openorb.ots.log.Writer.out.commit_end( xid,
+ org.omg.CosTransactions.Status.StatusCommitted );
org.openorb.ots.log.Writer.out.completed( xid );
}
@@ -146,12 +158,15 @@
case org.omg.CosTransactions.Vote._VoteRollback :
{
org.openorb.ots.Verbose.print( "RecoveryManager", "Rollback is voted" );
- // Here, we have to rollback all prepared resources ( which are not already rolledback
- // but in this case the prepared_resources does not return them ).
- org.omg.CosTransactions.Resource [] prepared_resources = _monitor.prepared_resources( xid );
+ // Here, we have to rollback all prepared resources ( which are not already
+ // rolledback but in this case the prepared_resources does not
+ // return them ).
+ org.omg.CosTransactions.Resource [] prepared_resources =
+ m_monitor.prepared_resources( xid );
rollback_resources( xid, prepared_resources );
// Now, we log the transaction completion
- org.openorb.ots.log.Writer.out.rollback_end( xid, org.omg.CosTransactions.Status.StatusRolledBack );
+ org.openorb.ots.log.Writer.out.rollback_end( xid,
+ org.omg.CosTransactions.Status.StatusRolledBack );
org.openorb.ots.log.Writer.out.completed( xid );
}
@@ -167,28 +182,34 @@
// Two possibilities !
// 1. No rollback has been sent to resources. In this case, we continue to commit
// 2. A rollback has been sent, and we have to continue rollback
- if ( _monitor.is_any_rollback( xid ) )
+ if ( m_monitor.is_any_rollback( xid ) )
{
org.openorb.ots.Verbose.print( "RecoveryManager", "Must be rolledback" );
// Case 2
- // Here, we have to rollback all prepared resources ( which are not already rolledback
- // and not committed but in this case the prepared_resources does not return them ).
- org.omg.CosTransactions.Resource [] prepared_resources = _monitor.prepared_resources( xid );
+ // Here, we have to rollback all prepared resources ( which are not already
+ // rolledback and not committed but in this case the prepared_resources
+ // does not return them ).
+ org.omg.CosTransactions.Resource [] prepared_resources =
+ m_monitor.prepared_resources( xid );
rollback_resources( xid, prepared_resources );
// Now, we log the transaction completion
- org.openorb.ots.log.Writer.out.rollback_end( xid, org.omg.CosTransactions.Status.StatusRolledBack );
+ org.openorb.ots.log.Writer.out.rollback_end( xid,
+ org.omg.CosTransactions.Status.StatusRolledBack );
org.openorb.ots.log.Writer.out.completed( xid );
}
else
{
org.openorb.ots.Verbose.print( "RecoveryManager", "Continue commit" );
// Case 1
- // Here, we have to rollback all prepared resources ( which are not already committed
- // but in this case the prepared_resources does not return them ).
- org.omg.CosTransactions.Resource [] prepared_resources = _monitor.prepared_resources( xid );
- org.omg.CosTransactions.Resource [] registered_resources = _monitor.registered_resources( xid );
+ // Here, we have to rollback all prepared resources ( which are not already
+ // committed but in this case the prepared_resources does not return them ).
+ org.omg.CosTransactions.Resource [] prepared_resources =
+ m_monitor.prepared_resources( xid );
+ org.omg.CosTransactions.Resource [] registered_resources =
+ m_monitor.registered_resources( xid );
- if ( ( prepared_resources.length == 1 ) && ( registered_resources.length == 1 ) )
+ if ( ( prepared_resources.length == 1 )
+ && ( registered_resources.length == 1 ) )
continue_commit_one_phase( xid, prepared_resources[ 0 ] );
else
continue_commit( xid, prepared_resources );
@@ -200,12 +221,14 @@
case org.omg.CosTransactions.Status._StatusRollingBack :
{
org.openorb.ots.Verbose.print( "RecoveryManager", "transaction is rolling back" );
- // Here, the transaction rollingback. We have to rollback all resources which are not already
- // rolledback.
- org.omg.CosTransactions.Resource [] free_resources = _monitor.free_resources( xid );
+ // Here, the transaction rollingback. We have to rollback all resources which are
+ // not already rolledback.
+ org.omg.CosTransactions.Resource [] free_resources =
+ m_monitor.free_resources( xid );
rollback_resources( xid, free_resources );
// Now, we log the transaction completion
- org.openorb.ots.log.Writer.out.rollback_end( xid, org.omg.CosTransactions.Status.StatusRolledBack );
+ org.openorb.ots.log.Writer.out.rollback_end( xid,
+ org.omg.CosTransactions.Status.StatusRolledBack );
org.openorb.ots.log.Writer.out.completed( xid );
}
@@ -214,7 +237,8 @@
default :
// Nothing to do... really !
// Just log the transaction completion
- org.openorb.ots.Verbose.print( "RecoveryManager", "transaction state not expected, just to be completed : " + status.value() );
+ org.openorb.ots.Verbose.print( "RecoveryManager",
+ "transaction state not expected, just to be completed : " + status.value() );
org.openorb.ots.log.Writer.out.completed( xid );
break;
}
@@ -223,7 +247,8 @@
/**
* This operation is used to rollback resources
*/
- private void rollback_resources( org.openorb.ots.Impl.XID xid, org.omg.CosTransactions.Resource [] resources )
+ private void rollback_resources( org.openorb.ots.Impl.XID xid,
+ org.omg.CosTransactions.Resource [] resources )
{
for ( int i = 0; i < resources.length; i++ )
{
@@ -246,9 +271,9 @@
}
catch ( org.omg.CORBA.COMM_FAILURE ex )
{
- // Nothing to do... Normally we have to retry later but we consider that the transaction
- // is rolledback and the resource will have to use the recovery coordinator to known
- // this outcome.
+ // Nothing to do... Normally we have to retry later but we consider that the
+ // transaction is rolledback and the resource will have to use the recovery
+ // coordinator to known this outcome.
}
catch ( org.omg.CORBA.OBJECT_NOT_EXIST ex )
{
@@ -260,7 +285,8 @@
/**
* This operation is used to complete the second phase of the 2.P.C protocol.
*/
- private void continue_commit( org.openorb.ots.Impl.XID xid, org.omg.CosTransactions.Resource [] resources )
+ private void continue_commit( org.openorb.ots.Impl.XID xid,
+ org.omg.CosTransactions.Resource [] resources )
{
boolean error = false;
boolean committed = false;
@@ -343,22 +369,22 @@
if ( !error )
{
- org.openorb.ots.log.Writer.out.commit_end( xid, org.omg.CosTransactions.Status.StatusCommitted );
+ org.openorb.ots.log.Writer.out.commit_end( xid,
+ org.omg.CosTransactions.Status.StatusCommitted );
}
else
{
- org.openorb.ots.log.Writer.out.rollback_end( xid, org.omg.CosTransactions.Status.StatusRolledBack );
+ org.openorb.ots.log.Writer.out.rollback_end( xid,
+ org.omg.CosTransactions.Status.StatusRolledBack );
}
//
// Send forget to the resources that reply heuristic
//
org.omg.CosTransactions.Resource res = null;
-
for ( int i = 0; i < _heuristic.size(); i++ )
{
res = ( org.omg.CosTransactions.Resource ) _heuristic.elementAt( i );
-
try
{
res.forget();
@@ -371,21 +397,19 @@
{
// Nothing to do...
}
-
}
-
org.openorb.ots.log.Writer.out.completed( xid );
}
/**
* This operation is used to complete a one phase commit
*/
- private void continue_commit_one_phase( org.openorb.ots.Impl.XID xid, org.omg.CosTransactions.Resource resource )
+ private void continue_commit_one_phase( org.openorb.ots.Impl.XID xid,
+ org.omg.CosTransactions.Resource resource )
{
try
{
resource.commit_one_phase();
-
org.openorb.ots.log.Writer.out.commit_resource( xid, resource );
}
catch ( org.omg.CosTransactions.HeuristicHazard ex )
@@ -400,7 +424,6 @@
{
// Nothing to do...
}
-
org.openorb.ots.log.Writer.out.completed( xid );
}
}
Index: SubCoordinator.java
===================================================================
RCS file: /cvsroot/openorb/TransactionService/src/main/org/openorb/ots/Impl/SubCoordinator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- SubCoordinator.java 29 Aug 2002 12:55:52 -0000 1.6
+++ SubCoordinator.java 30 Aug 2002 10:07:33 -0000 1.7
@@ -13,18 +13,19 @@
*
* @author Jerome Daniel
*/
-public class SubCoordinator extends org.openorb.ots.Impl.Coordinator
- implements org.omg.CosTransactions.ResourceOperations
+public class SubCoordinator
+ extends org.openorb.ots.Impl.Coordinator
+ implements org.omg.CosTransactions.ResourceOperations
{
/**
* Reference to the coordinator tie
*/
- private org.omg.CosTransactions.CoordinatorPOATie _coordinator_tie;
+ private org.omg.CosTransactions.CoordinatorPOATie m_coordinator_tie;
/**
* Reference to the terminator
*/
- private org.openorb.ots.Impl.Terminator _term;
+ private org.openorb.ots.Impl.Terminator m_terminator;
/**
* Constructor
@@ -36,21 +37,18 @@
org.omg.PortableServer.POA recovery_poa )
{
super( xid, time_out, poa, recovery_poa );
-
try
{
- _coordinator_tie = new org.omg.CosTransactions.CoordinatorPOATie( this );
-
- byte [] id = poa.activate_object( _coordinator_tie );
-
- upper.register_resource( org.omg.CosTransactions.ResourceHelper.narrow( poa.id_to_reference( id ) ) );
+ m_coordinator_tie = new org.omg.CosTransactions.CoordinatorPOATie( this );
+ byte [] id = poa.activate_object( m_coordinator_tie );
+ upper.register_resource( org.omg.CosTransactions.ResourceHelper.narrow(
+ poa.id_to_reference( id ) ) );
}
catch ( java.lang.Exception ex )
{
System.out.println( "OpenORB OTS warning SubCoordinator 1 : " + ex.toString() );
}
-
- _term = new org.openorb.ots.Impl.Terminator( poa, this );
+ m_terminator = new org.openorb.ots.Impl.Terminator( poa, this );
}
// ---------------------------------------------------------------------------------------
@@ -84,9 +82,8 @@
* exceptions. Heuristic outcomes occur when a resource acts as a sub-coordinator and at least
* one of its resources takes a heuristic decision after a VoteCommit return.
*/
-
public synchronized org.omg.CosTransactions.Vote prepare()
- throws org.omg.CosTransactions.HeuristicMixed, org.omg.CosTransactions.HeuristicHazard
+ throws org.omg.CosTransactions.HeuristicMixed, org.omg.CosTransactions.HeuristicHazard
{
switch ( _status.value() )
{
@@ -111,7 +108,8 @@
org.omg.CORBA.BooleanHolder mixed = new org.omg.CORBA.BooleanHolder( false );
org.omg.CORBA.BooleanHolder hazard = new org.omg.CORBA.BooleanHolder( false );
- org.omg.CosTransactions.Vote global_vote = _term.proceed_prepare( resources(), mixed, hazard );
+ org.omg.CosTransactions.Vote global_vote = m_terminator.proceed_prepare( resources(),
+ mixed, hazard );
if ( mixed.value )
throw new org.omg.CosTransactions.HeuristicMixed();
@@ -132,7 +130,7 @@
break;
case org.omg.CosTransactions.Vote._VoteRollback :
- _term.proceed_rollback();
+ m_terminator.proceed_rollback();
break;
}
@@ -149,11 +147,12 @@
* the resource can immediately forget all knowledge of the transaction.
*/
public synchronized void rollback()
- throws org.omg.CosTransactions.HeuristicCommit, org.omg.CosTransactions.HeuristicMixed, org.omg.CosTransactions.HeuristicHazard
+ throws org.omg.CosTransactions.HeuristicCommit, org.omg.CosTransactions.HeuristicMixed,
+ org.omg.CosTransactions.HeuristicHazard
{
- _term.disableRemove();
- _term.rollback();
- _term.enableRemove();
+ m_terminator.disableRemove();
+ m_terminator.rollback();
+ m_terminator.enableRemove();
removeItself();
}
@@ -170,23 +169,18 @@
* performing the prepare operation.
*/
public synchronized void commit()
- throws org.omg.CosTransactions.NotPrepared, org.omg.CosTransactions.HeuristicRollback, org.omg.CosTransactions.HeuristicMixed, org.omg.CosTransactions.HeuristicHazard
+ throws org.omg.CosTransactions.NotPrepared, org.omg.CosTransactions.HeuristicRollback,
+ org.omg.CosTransactions.HeuristicMixed, org.omg.CosTransactions.HeuristicHazard
{
if ( _status.value() != org.omg.CosTransactions.Status._StatusPrepared )
throw new org.omg.CosTransactions.NotPrepared();
-
org.omg.CORBA.BooleanHolder mixed = new org.omg.CORBA.BooleanHolder( false );
-
org.omg.CORBA.BooleanHolder hazard = new org.omg.CORBA.BooleanHolder( false );
-
- _term.proceed_commit( resources(), mixed, hazard );
-
+ m_terminator.proceed_commit( resources(), mixed, hazard );
if ( mixed.value )
throw new org.omg.CosTransactions.HeuristicMixed();
-
if ( hazard.value )
throw new org.omg.CosTransactions.HeuristicHazard();
-
removeItself();
}
@@ -205,9 +199,9 @@
{
try
{
- _term.disableRemove();
- _term.commit( true );
- _term.enableRemove();
+ m_terminator.disableRemove();
+ m_terminator.commit( true );
+ m_terminator.enableRemove();
removeItself();
}
catch ( org.omg.CosTransactions.HeuristicMixed ex )
@@ -224,8 +218,7 @@
*/
public synchronized void forget()
{
- _term.proceed_forget();
-
+ m_terminator.proceed_forget();
removeItself();
}
@@ -241,12 +234,10 @@
public void removeItself()
{
super.removeItself();
-
try
{
org.openorb.ots.log.Writer.out.completed( _xid );
-
- _poa.deactivate_object( _poa.servant_to_id( _coordinator_tie ) );
+ _poa.deactivate_object( _poa.servant_to_id( m_coordinator_tie ) );
}
catch ( org.omg.PortableServer.POAPackage.ObjectNotActive ex )
{
Index: SubTransCoordinator.java
===================================================================
RCS file: /cvsroot/openorb/TransactionService/src/main/org/openorb/ots/Impl/SubTransCoordinator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- SubTransCoordinator.java 21 Aug 2002 08:28:16 -0000 1.4
+++ SubTransCoordinator.java 30 Aug 2002 10:07:34 -0000 1.5
@@ -13,12 +13,18 @@
*
* @author Jerome Daniel
*/
-public class SubTransCoordinator extends org.openorb.ots.Impl.Coordinator
+public class SubTransCoordinator
+ extends org.openorb.ots.Impl.Coordinator
{
/**
* Reference to the parent control object
*/
- public org.omg.CosTransactions.TransIdentity [] _parents;
+ private org.omg.CosTransactions.TransIdentity [] m_parents;
+
+ public org.omg.CosTransactions.TransIdentity [] getParents()
+ {
+ return m_parents;
+ }
/**
* Constructor
@@ -29,8 +35,7 @@
org.omg.PortableServer.POA poa )
{
super( xid, time_out, poa, parents );
-
- _parents = parents;
+ m_parents = parents;
}
// -----------------------------------------------------------------------------------------
@@ -46,7 +51,7 @@
*/
public org.omg.CosTransactions.Status get_parent_status()
{
- return _parents[ _parents.length - 1 ].coord.get_status();
+ return m_parents[ m_parents.length - 1 ].coord.get_status();
}
/**
@@ -56,7 +61,7 @@
*/
public org.omg.CosTransactions.Status get_top_level_status()
{
- return _parents[ 0 ].coord.get_top_level_status();
+ return m_parents[ 0 ].coord.get_top_level_status();
}
/**
@@ -72,7 +77,7 @@
if ( identities.length == 0 )
return false;
- if ( !identities[ 0 ].coord.equals( _parents[ 0 ].coord ) )
+ if ( !identities[ 0 ].coord.equals( m_parents[ 0 ].coord ) )
return false;
return true;
@@ -93,10 +98,10 @@
{
org.omg.CosTransactions.TransIdentity [] identities = tc.get_txcontext().parents;
- if ( identities.length < ( _parents.length + 1 ) )
+ if ( identities.length < ( m_parents.length + 1 ) )
return false;
- if ( !identities[ _parents.length ].coord.equals( _this() ) )
+ if ( !identities[ m_parents.length ].coord.equals( _this() ) )
return false;
return true;
@@ -125,7 +130,7 @@
*/
public int hash_top_level_tran()
{
- return _parents[ 0 ].coord.hash_top_level_tran();
+ return m_parents[ 0 ].coord.hash_top_level_tran();
}
/**
@@ -134,8 +139,8 @@
*/
public java.lang.String get_transaction_name()
{
- String transaction_name = "[ SUB OpenORB : " + _xid.get_gtrid() + " / " + _xid.get_bqual() + "]";
-
+ String transaction_name = "[ SUB OpenORB : " + _xid.get_gtrid() + " / "
+ + _xid.get_bqual() + "]";
return transaction_name;
}
@@ -159,8 +164,9 @@
* This operation returns a RecoveryCoordinator that can be used by this resource during
* recovery.
*/
- public org.omg.CosTransactions.RecoveryCoordinator register_resource( org.omg.CosTransactions.Resource r )
- throws org.omg.CosTransactions.Inactive
+ public org.omg.CosTransactions.RecoveryCoordinator register_resource(
+ org.omg.CosTransactions.Resource r )
+ throws org.omg.CosTransactions.Inactive
{
switch ( _status.value() )
{
@@ -179,7 +185,7 @@
throw new org.omg.CosTransactions.Inactive();
}
- return _parents[ 0 ].coord.register_resource( r );
+ return m_parents[ 0 ].coord.register_resource( r );
}
/**
@@ -197,7 +203,7 @@
* may be raised if the subtransaction (or any ancestor) has been marked rollback only.
*/
public void register_subtran_aware( org.omg.CosTransactions.SubtransactionAwareResource r )
- throws org.omg.CosTransactions.Inactive, org.omg.CosTransactions.NotSubtransaction
+ throws org.omg.CosTransactions.Inactive, org.omg.CosTransactions.NotSubtransaction
{
switch ( _status.value() )
{
@@ -232,7 +238,7 @@
* for the Control object to be transmitted to or used in other execution environments.
*/
public org.omg.CosTransactions.Control create_subtransaction()
- throws org.omg.CosTransactions.SubtransactionsUnavailable, org.omg.CosTransactions.Inactive
+ throws org.omg.CosTransactions.SubtransactionsUnavailable, org.omg.CosTransactions.Inactive
{
switch ( _status.value() )
{
@@ -243,13 +249,15 @@
throw new org.omg.CosTransactions.Inactive();
};
- org.omg.CosTransactions.TransIdentity [] parents = new org.omg.CosTransactions.TransIdentity[ _parents.length + 1 ];
+ org.omg.CosTransactions.TransIdentity [] parents =
+ new org.omg.CosTransactions.TransIdentity[ m_parents.length + 1 ];
- System.arraycopy( _parents, 0, parents, 0, _parents.length );
+ System.arraycopy( m_parents, 0, parents, 0, m_parents.length );
- parents[ _parents.length ] = _pctx.current;
+ parents[ m_parents.length ] = _pctx.current;
- org.openorb.ots.Impl.Control ctrl = new org.openorb.ots.Impl.Control( _time_out, _xid, _poa, parents );
+ org.openorb.ots.Impl.Control ctrl = new org.openorb.ots.Impl.Control( _time_out,
+ _xid, _poa, parents );
try
{
@@ -257,15 +265,19 @@
ctrl.update();
- org.omg.CosTransactions.Control control = org.omg.CosTransactions.ControlHelper.narrow( _poa.id_to_reference( id ) );
+ org.omg.CosTransactions.Control control = org.omg.CosTransactions.ControlHelper.narrow(
+ _poa.id_to_reference( id ) );
- org.openorb.ots.Impl.SubTransListener subtran_listener = new org.openorb.ots.Impl.SubTransListener( this, ctrl, _poa );
+ org.openorb.ots.Impl.SubTransListener subtran_listener =
+ new org.openorb.ots.Impl.SubTransListener( this, ctrl, _poa );
_sub_transactions.addElement( subtran_listener );
id = _poa.activate_object( subtran_listener );
- org.omg.CosTransactions.SubtransactionAwareResource subres = org.omg.CosTransactions.SubtransactionAwareResourceHelper.narrow( _poa.id_to_reference( id ) );
+ org.omg.CosTransactions.SubtransactionAwareResource subres =
+ org.omg.CosTransactions.SubtransactionAwareResourceHelper.narrow(
+ _poa.id_to_reference( id ) );
control.get_coordinator().register_subtran_aware( subres );
@@ -291,13 +303,13 @@
*/
public org.omg.CosTransactions.SubtransactionAwareResource [] subtran_resources()
{
- org.omg.CosTransactions.SubtransactionAwareResource [] r = new org.omg.CosTransactions.SubtransactionAwareResource[ _resources.size() ];
-
+ org.omg.CosTransactions.SubtransactionAwareResource [] r =
+ new org.omg.CosTransactions.SubtransactionAwareResource[ _resources.size() ];
for ( int i = 0; i < _resources.size(); i++ )
{
- r[ i ] = ( org.omg.CosTransactions.SubtransactionAwareResource ) _resources.elementAt( i );
+ r[ i ] = ( org.omg.CosTransactions.SubtransactionAwareResource )
+ _resources.elementAt( i );
}
-
return r;
}
}
Index: SubTransListener.java
===================================================================
RCS file: /cvsroot/openorb/TransactionService/src/main/org/openorb/ots/Impl/SubTransListener.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- SubTransListener.java 29 Aug 2002 12:55:52 -0000 1.6
+++ SubTransListener.java 30 Aug 2002 10:07:34 -0000 1.7
@@ -13,40 +13,39 @@
*
* @author Jerome Daniel
*/
-public class SubTransListener extends org.omg.CosTransactions.SubtransactionAwareResourcePOA
+public class SubTransListener
+ extends org.omg.CosTransactions.SubtransactionAwareResourcePOA
{
/**
* Flag that precises if the sub transaction has been completed
*/
- private boolean _completed;
+ private boolean m_completed;
/**
* Reference to the sub transaction control object
*/
- private org.openorb.ots.Impl.Control _ctrl;
+ private org.openorb.ots.Impl.Control m_ctrl;
/**
* Reference to the POA
*/
- private org.omg.PortableServer.POA _poa;
+ private org.omg.PortableServer.POA m_poa;
/**
* Reference to the parent coordinator object
*/
- private org.openorb.ots.Impl.Coordinator _coord;
+ private org.openorb.ots.Impl.Coordinator m_coordinator;
/**
* Constructor
*/
- public SubTransListener( org.openorb.ots.Impl.Coordinator coord, org.openorb.ots.Impl.Control ctrl, org.omg.PortableServer.POA poa )
+ public SubTransListener( org.openorb.ots.Impl.Coordinator coord,
+ org.openorb.ots.Impl.Control ctrl, org.omg.PortableServer.POA poa )
{
- _completed = false;
-
- _coord = coord;
-
- _ctrl = ctrl;
-
- _poa = poa;
+ m_completed = false;
+ m_coordinator = coord;
+ m_ctrl = ctrl;
+ m_poa = poa;
}
// ---------------------------------------------------------------------------------------
@@ -57,11 +56,11 @@
public void commit_pending()
{
- if ( _completed == false )
+ if ( m_completed == false )
{
try
{
- _ctrl.get_terminator().commit( false );
+ m_ctrl.get_terminator().commit( false );
}
catch ( java.lang.Exception ex )
{
@@ -72,11 +71,11 @@
public void rollback_pending()
{
- if ( _completed == false )
+ if ( m_completed == false )
{
try
{
- _ctrl.get_terminator().rollback();
+ m_ctrl.get_terminator().rollback();
}
catch ( java.lang.Exception ex )
{
@@ -85,14 +84,14 @@
}
}
+
+
// ---------------------------------------------------------------------------------------
//
// Resource interface
//
// ---------------------------------------------------------------------------------------
-
-
public synchronized org.omg.CosTransactions.Vote prepare()
throws org.omg.CosTransactions.HeuristicMixed,
org.omg.CosTransactions.HeuristicHazard
@@ -135,14 +134,14 @@
public void commit_subtransaction( org.omg.CosTransactions.Coordinator coord )
{
- _completed = true;
- _coord.remove_subtran_listener( this );
+ m_completed = true;
+ m_coordinator.remove_subtran_listener( this );
}
public void rollback_subtransaction()
{
- _completed = true;
- _coord.remove_subtran_listener( this );
+ m_completed = true;
+ m_coordinator.remove_subtran_listener( this );
}
// ---------------------------------------------------------------------------------------
@@ -157,13 +156,11 @@
public void remove()
{
// remove the sub trans terminator that will remove all sub transaction elements
-
- _ctrl._sub_terminator_impl.removeItself();
-
+ m_ctrl.getSubTransTerminator().removeItself();
try
{
// Remove the control
- _poa.deactivate_object( _poa.servant_to_id( this ) );
+ m_poa.deactivate_object( m_poa.servant_to_id( this ) );
}
catch ( org.omg.PortableServer.POAPackage.ObjectNotActive ex )
{
Index: SubTransTerminator.java
===================================================================
RCS file: /cvsroot/openorb/TransactionService/src/main/org/openorb/ots/Impl/SubTransTerminator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- SubTransTerminator.java 29 Aug 2002 12:55:52 -0000 1.6
+++ SubTransTerminator.java 30 Aug 2002 10:07:34 -0000 1.7
@@ -13,26 +13,27 @@
*
* @author Jerome Daniel
*/
-public class SubTransTerminator extends org.omg.CosTransactions.TerminatorPOA
+public class SubTransTerminator
+ extends org.omg.CosTransactions.TerminatorPOA
{
/**
* Reference to the coordinator
*/
- private org.openorb.ots.Impl.SubTransCoordinator _coordinator;
+ private org.openorb.ots.Impl.SubTransCoordinator m_coordinator;
/**
* Reference to the POA
*/
- private org.omg.PortableServer.POA _poa;
+ private org.omg.PortableServer.POA m_poa;
/**
* Constructor
*/
- public SubTransTerminator( org.omg.PortableServer.POA poa , org.openorb.ots.Impl.Coordinator coordinator )
+ public SubTransTerminator( org.omg.PortableServer.POA poa,
+ org.openorb.ots.Impl.Coordinator coordinator )
{
- _coordinator = ( org.openorb.ots.Impl.SubTransCoordinator ) coordinator;
-
- _poa = poa;
+ m_coordinator = ( org.openorb.ots.Impl.SubTransCoordinator ) coordinator;
+ m_poa = poa;
}
// -------------------------------------------------------------------------------------
@@ -64,13 +65,13 @@
*/
public synchronized void commit( boolean report_heuristics )
- throws org.omg.CosTransactions.HeuristicMixed, org.omg.CosTransactions.HeuristicHazard
+ throws org.omg.CosTransactions.HeuristicMixed, org.omg.CosTransactions.HeuristicHazard
{
//
// Checks all cases
//
- switch ( _coordinator.get_status().value() )
+ switch ( m_coordinator.get_status().value() )
{
case org.omg.CosTransactions.Status._StatusActive : // Normal case
@@ -103,7 +104,7 @@
//
// Checks all cases
//
- switch ( _coordinator.get_status().value() )
+ switch ( m_coordinator.get_status().value() )
{
case org.omg.CosTransactions.Status._StatusActive :
@@ -123,9 +124,7 @@
//
// Now begin rollback
//
-
- _coordinator.synchronize();
-
+ m_coordinator.synchronize();
proceed_rollback();
}
@@ -140,19 +139,16 @@
*/
public synchronized void proceed_commit()
{
- _coordinator.setStatus( org.omg.CosTransactions.Status.StatusCommitting );
-
- _coordinator.commit_sub_transactions();
-
- _coordinator.setStatus( org.omg.CosTransactions.Status.StatusCommitted );
-
- _coordinator.desynchronize();
-
- org.omg.CosTransactions.SubtransactionAwareResource [] resources = _coordinator.subtran_resources();
-
+ m_coordinator.setStatus( org.omg.CosTransactions.Status.StatusCommitting );
+ m_coordinator.commit_sub_transactions();
+ m_coordinator.setStatus( org.omg.CosTransactions.Status.StatusCommitted );
+ m_coordinator.desynchronize();
+ org.omg.CosTransactions.SubtransactionAwareResource [] resources =
+ m_coordinator.subtran_resources();
for ( int i = 0; i < resources.length; i++ )
- resources[ i ].commit_subtransaction( ( ( SubTransCoordinator ) _coordinator )._parents[ ( ( SubTransCoordinator ) _coordinator )._parents.length - 1 ].coord );
-
+ resources[ i ].commit_subtransaction( ( ( SubTransCoordinator )
+ m_coordinator ).getParents()[ ( ( SubTransCoordinator )
+ m_coordinator ).getParents().length - 1 ].coord );
}
@@ -161,16 +157,12 @@
*/
public synchronized void proceed_rollback()
{
- _coordinator.setStatus( org.omg.CosTransactions.Status.StatusRollingBack );
-
- _coordinator.rollback_sub_transactions();
-
- _coordinator.setStatus( org.omg.CosTransactions.Status.StatusRolledBack );
-
- _coordinator.desynchronize();
-
- org.omg.CosTransactions.SubtransactionAwareResource [] resources = _coordinator.subtran_resources();
-
+ m_coordinator.setStatus( org.omg.CosTransactions.Status.StatusRollingBack );
+ m_coordinator.rollback_sub_transactions();
+ m_coordinator.setStatus( org.omg.CosTransactions.Status.StatusRolledBack );
+ m_coordinator.desynchronize();
+ org.omg.CosTransactions.SubtransactionAwareResource [] resources =
+ m_coordinator.subtran_resources();
for ( int i = 0; i < resources.length; i++ )
resources[ i ].rollback_subtransaction();
}
@@ -180,13 +172,11 @@
*/
public void removeItself()
{
- org.openorb.ots.log.Writer.out.completed( _coordinator._xid );
-
+ org.openorb.ots.log.Writer.out.completed( m_coordinator._xid );
try
{
- _poa.deactivate_object( _poa.servant_to_id( this ) );
-
- _coordinator.removeItself();
+ m_poa.deactivate_object( m_poa.servant_to_id( this ) );
+ m_coordinator.removeItself();
}
catch ( org.omg.PortableServer.POAPackage.ObjectNotActive ex )
{
Index: TimeOutControl.java
===================================================================
RCS file: /cvsroot/openorb/TransactionService/src/main/org/openorb/ots/Impl/TimeOutControl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- TimeOutControl.java 21 Aug 2002 08:28:16 -0000 1.4
+++ TimeOutControl.java 30 Aug 2002 10:07:34 -0000 1.5
@@ -13,39 +13,37 @@
*
* @author Jerome Daniel
*/
-public class TimeOutControl extends java.lang.Thread
+public class TimeOutControl
+ extends java.lang.Thread
{
/**
* Reference to the transaction terminator
*/
- private org.openorb.ots.Impl.Terminator _term;
+ private org.openorb.ots.Impl.Terminator m_terminator;
/**
* Time out
*/
- private int _time_out;
+ private int m_time_out;
/**
* Transaction state
*/
- private int _transaction_state;
+ private int m_transaction_state;
- private final int IN_PROCESS = 0;
+ private static final int IN_PROCESS = 0;
- private final int FINISHED = 1;
+ private static final int FINISHED = 1;
/**
* Constructor
*/
public TimeOutControl( org.openorb.ots.Impl.Terminator term, int time_out )
{
- _term = term;
-
- _time_out = time_out;
-
- _transaction_state = IN_PROCESS;
-
- _term.setTimeOutControl( this );
+ m_terminator = term;
+ m_time_out = time_out;
+ m_transaction_state = IN_PROCESS;
+ m_terminator.setTimeOutControl( this );
}
/**
@@ -53,7 +51,7 @@
*/
public void finish()
{
- _transaction_state = FINISHED;
+ m_transaction_state = FINISHED;
}
/**
@@ -61,11 +59,11 @@
*/
public void proceed()
{
- switch ( _transaction_state )
+ switch ( m_transaction_state )
{
case IN_PROCESS :
- _term.proceed_rollback();
+ m_terminator.proceed_rollback();
break;
case FINISHED :
@@ -85,8 +83,7 @@
{
try
{
- sleep( _time_out * 1000 );
-
+ sleep( m_time_out * 1000 );
proceed();
}
catch ( java.lang.Exception e )
Index: TransactionFactory.java
===================================================================
RCS file: /cvsroot/openorb/TransactionService/src/main/org/openorb/ots/Impl/TransactionFa...
[truncated message content] |