Menu
▾
▴
[openorb-commits] CVS: NotificationService/src/main/org/openorb/notify/impl ConsumerAdminImpl.java,1.30,1.31 SupplierAdminImpl.java,1.26,1.27
|
From: <lk...@us...> - 2005-05-23 03:45:49
|
Update of /cvsroot/openorb/NotificationService/src/main/org/openorb/notify/impl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1607/src/main/org/openorb/notify/impl Modified Files: ConsumerAdminImpl.java SupplierAdminImpl.java Log Message: ConsumerAdmin no longer generates overlapping proxy ids for pull and push suppliers. Fix contributed by jiangwei_1976 at yahoo _dot_ com _dot_ cn Index: ConsumerAdminImpl.java =================================================================== RCS file: /cvsroot/openorb/NotificationService/src/main/org/openorb/notify/impl/ConsumerAdminImpl.java,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- ConsumerAdminImpl.java 10 Dec 2004 15:32:57 -0000 1.30 +++ ConsumerAdminImpl.java 23 May 2005 03:45:40 -0000 1.31 @@ -556,7 +556,7 @@ { case ClientType._STRUCTURED_EVENT : - proxy_id.value = m_pssConsumerAdmin.next_pull_supplier_id(); + proxy_id.value = m_pssConsumerAdmin.next_supplier_id(); if ( getLogger().isDebugEnabled() ) { @@ -572,7 +572,7 @@ case ClientType._SEQUENCE_EVENT : - proxy_id.value = m_pssConsumerAdmin.next_pull_supplier_id(); + proxy_id.value = m_pssConsumerAdmin.next_supplier_id(); if ( getLogger().isDebugEnabled() ) { @@ -589,7 +589,7 @@ case ClientType._ANY_EVENT : - proxy_id.value = m_pssConsumerAdmin.next_pull_supplier_id(); + proxy_id.value = m_pssConsumerAdmin.next_supplier_id(); if ( getLogger().isDebugEnabled() ) { @@ -630,7 +630,7 @@ newSuppliers[suppliers.length] = new ConnectionInfo( proxy_id.value, pid, m_poa.id_to_reference( pid ) ); - m_pssConsumerAdmin.next_pull_supplier_id( proxy_id.value + 1 ); + m_pssConsumerAdmin.next_supplier_id( proxy_id.value + 1 ); m_pssConsumerAdmin.pull_suppliers( newSuppliers ); @@ -699,7 +699,7 @@ case ClientType._STRUCTURED_EVENT : - proxy_id.value = m_pssConsumerAdmin.next_push_supplier_id(); + proxy_id.value = m_pssConsumerAdmin.next_supplier_id(); if ( getLogger().isDebugEnabled() ) { @@ -716,7 +716,7 @@ case ClientType._SEQUENCE_EVENT : - proxy_id.value = m_pssConsumerAdmin.next_push_supplier_id(); + proxy_id.value = m_pssConsumerAdmin.next_supplier_id(); if ( getLogger().isDebugEnabled() ) { @@ -733,7 +733,7 @@ case ClientType._ANY_EVENT : - proxy_id.value = m_pssConsumerAdmin.next_push_supplier_id(); + proxy_id.value = m_pssConsumerAdmin.next_supplier_id(); if ( getLogger().isDebugEnabled() ) { @@ -774,7 +774,7 @@ newSuppliers[suppliers.length] = new ConnectionInfo( proxy_id.value, pid, m_poa.id_to_reference( pid ) ); - m_pssConsumerAdmin.next_push_supplier_id( proxy_id.value + 1 ); + m_pssConsumerAdmin.next_supplier_id( proxy_id.value + 1 ); m_pssConsumerAdmin.push_suppliers( newSuppliers ); Index: SupplierAdminImpl.java =================================================================== RCS file: /cvsroot/openorb/NotificationService/src/main/org/openorb/notify/impl/SupplierAdminImpl.java,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- SupplierAdminImpl.java 16 May 2004 17:55:01 -0000 1.26 +++ SupplierAdminImpl.java 23 May 2005 03:45:40 -0000 1.27 @@ -422,7 +422,7 @@ { case ClientType._STRUCTURED_EVENT: - proxy_id.value = m_pssSupplierAdmin.next_pull_consumer_id(); + proxy_id.value = m_pssSupplierAdmin.next_consumer_id(); if ( getLogger().isDebugEnabled() ) { @@ -439,7 +439,7 @@ case ClientType._SEQUENCE_EVENT: - proxy_id.value = m_pssSupplierAdmin.next_pull_consumer_id(); + proxy_id.value = m_pssSupplierAdmin.next_consumer_id(); if ( getLogger().isDebugEnabled() ) { @@ -456,7 +456,7 @@ case ClientType._ANY_EVENT: - proxy_id.value = m_pssSupplierAdmin.next_pull_consumer_id(); + proxy_id.value = m_pssSupplierAdmin.next_consumer_id(); getLogger().debug( getId() + " AnyPullConsumer created with id " @@ -494,7 +494,7 @@ newConsumers[consumers.length] = new ConnectionInfo( proxy_id.value, pid, m_poa.id_to_reference( pid ) ); - m_pssSupplierAdmin.next_pull_consumer_id( proxy_id.value + 1 ); + m_pssSupplierAdmin.next_consumer_id( proxy_id.value + 1 ); m_pssSupplierAdmin.pull_consumers( newConsumers ); @@ -560,7 +560,7 @@ case ClientType._STRUCTURED_EVENT: - proxy_id.value = m_pssSupplierAdmin.next_push_consumer_id(); + proxy_id.value = m_pssSupplierAdmin.next_consumer_id(); if ( getLogger().isDebugEnabled() ) { @@ -577,7 +577,7 @@ case ClientType._SEQUENCE_EVENT: - proxy_id.value = m_pssSupplierAdmin.next_push_consumer_id(); + proxy_id.value = m_pssSupplierAdmin.next_consumer_id(); if ( getLogger().isDebugEnabled() ) { @@ -594,7 +594,7 @@ case ClientType._ANY_EVENT: - proxy_id.value = m_pssSupplierAdmin.next_push_consumer_id(); + proxy_id.value = m_pssSupplierAdmin.next_consumer_id(); if ( getLogger().isDebugEnabled() ) { @@ -636,7 +636,7 @@ newConsumers[consumers.length] = new ConnectionInfo( proxy_id.value, pid, m_poa.id_to_reference( pid ) ); - m_pssSupplierAdmin.next_push_consumer_id( proxy_id.value + 1 ); + m_pssSupplierAdmin.next_consumer_id( proxy_id.value + 1 ); m_pssSupplierAdmin.push_consumers( newConsumers ); |
