diff options
author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-01-14 10:15:29 +0000 |
---|---|---|
committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-01-14 10:15:29 +0000 |
commit | 9e7c3bcdba010a8a46d9a51d221e02222a6efc89 (patch) | |
tree | dff0563158f6cfb5a3169eea0cbb70bec200b8f0 /libjava/classpath/gnu/CORBA/Poa | |
parent | 7493a7e159c3886ea2effc5f1c5dd52adf1aac64 (diff) | |
download | gcc-9e7c3bcdba010a8a46d9a51d221e02222a6efc89.tar.gz |
2011-01-14 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 168776
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@168777 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/classpath/gnu/CORBA/Poa')
25 files changed, 104 insertions, 104 deletions
diff --git a/libjava/classpath/gnu/CORBA/Poa/AOM.java b/libjava/classpath/gnu/CORBA/Poa/AOM.java index f8820bff83b..4b2264f3ce9 100644 --- a/libjava/classpath/gnu/CORBA/Poa/AOM.java +++ b/libjava/classpath/gnu/CORBA/Poa/AOM.java @@ -162,9 +162,9 @@ public class AOM /** * Get the record of the stored object. If the object is mapped several times * under the different keys, one of the mappings is used. - * + * * @param stored_object the stored object - * + * * @return the record about the stored object, null if this object is not * stored here. */ @@ -214,9 +214,9 @@ public class AOM /** * Find the reference info for the given servant. If the servant is mapped to * several objects, this returns the first found occurence. - * + * * @param servant a servant to find. - * + * * @return the servant/object/POA binding or null if no such found. */ public Obj findServant(Servant servant) @@ -403,4 +403,4 @@ public class AOM return r; } -}
\ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Poa/AccessiblePolicy.java b/libjava/classpath/gnu/CORBA/Poa/AccessiblePolicy.java index 44ebaf45351..5468d229269 100644 --- a/libjava/classpath/gnu/CORBA/Poa/AccessiblePolicy.java +++ b/libjava/classpath/gnu/CORBA/Poa/AccessiblePolicy.java @@ -59,4 +59,4 @@ public interface AccessiblePolicy */ int getCode(); -}
\ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Poa/DynamicImpHandler.java b/libjava/classpath/gnu/CORBA/Poa/DynamicImpHandler.java index 903f8bfbbe1..4ee02995d6c 100644 --- a/libjava/classpath/gnu/CORBA/Poa/DynamicImpHandler.java +++ b/libjava/classpath/gnu/CORBA/Poa/DynamicImpHandler.java @@ -82,4 +82,4 @@ public class DynamicImpHandler { throw new BAD_OPERATION(servant + " is not an InvokeHandler."); } -}
\ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Poa/ForwardRequestHolder.java b/libjava/classpath/gnu/CORBA/Poa/ForwardRequestHolder.java index 5e2455952d2..a8517352638 100644 --- a/libjava/classpath/gnu/CORBA/Poa/ForwardRequestHolder.java +++ b/libjava/classpath/gnu/CORBA/Poa/ForwardRequestHolder.java @@ -104,4 +104,4 @@ public class ForwardRequestHolder { ForwardRequestHelper.write(output, value); } -}
\ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Poa/ForwardedServant.java b/libjava/classpath/gnu/CORBA/Poa/ForwardedServant.java index b1d5eaf8c03..c54a0265413 100644 --- a/libjava/classpath/gnu/CORBA/Poa/ForwardedServant.java +++ b/libjava/classpath/gnu/CORBA/Poa/ForwardedServant.java @@ -206,4 +206,4 @@ public class ForwardedServant { return ref._ids(); } -}
\ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Poa/InvalidPolicyHolder.java b/libjava/classpath/gnu/CORBA/Poa/InvalidPolicyHolder.java index 154762acf00..b415034a32f 100644 --- a/libjava/classpath/gnu/CORBA/Poa/InvalidPolicyHolder.java +++ b/libjava/classpath/gnu/CORBA/Poa/InvalidPolicyHolder.java @@ -103,4 +103,4 @@ public class InvalidPolicyHolder { return InvalidPolicyHelper.type(); } -}
\ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Poa/LocalDelegate.java b/libjava/classpath/gnu/CORBA/Poa/LocalDelegate.java index 72dd8f0cf50..7b42fde1ea2 100644 --- a/libjava/classpath/gnu/CORBA/Poa/LocalDelegate.java +++ b/libjava/classpath/gnu/CORBA/Poa/LocalDelegate.java @@ -70,7 +70,7 @@ import java.util.Arrays; * A local delegate, transferring all object requests to the locally available * servant. This class is involved in handling the method invocations on the * local object, obtained by POA.create_reference_with_id. - * + * * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org) */ public class LocalDelegate @@ -98,7 +98,7 @@ public class LocalDelegate poa = a_poa; Id = an_id; } - + /** * Get the IOR of the connected object. */ @@ -171,9 +171,9 @@ public class LocalDelegate /** * Check if this object could be named by the given repository id. - * + * * @param idl_id the repository id to check. - * + * * @return true if it is one of the possible repository ids of this object. */ public boolean is_a(org.omg.CORBA.Object a_servant, String idl_id) @@ -238,11 +238,11 @@ public class LocalDelegate /** * Create a request to invoke the method of this CORBA object. - * + * * @param operation the name of the method to invoke. * @param response_expected specifies if this is one way message or the * response to the message is expected. - * + * * @return the stream where the method arguments should be written. */ public org.omg.CORBA.portable.OutputStream request( @@ -289,7 +289,7 @@ public class LocalDelegate /** * Make an invocation. - * + * * @param target not in use. * @param output the stream request that should be returned by * {@link #m_request} in this method. @@ -382,4 +382,4 @@ public class LocalDelegate { release(target); } -}
\ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Poa/LocalRequest.java b/libjava/classpath/gnu/CORBA/Poa/LocalRequest.java index 4a9ef8d9044..ca5b57b0036 100644 --- a/libjava/classpath/gnu/CORBA/Poa/LocalRequest.java +++ b/libjava/classpath/gnu/CORBA/Poa/LocalRequest.java @@ -199,8 +199,8 @@ public class LocalRequest extends gnuRequest implements ResponseHandler, public org.omg.CORBA.portable.InputStream v_invoke(InvokeHandler handler) { // Check maybe POA is in the discarding mode (will throw TRANSIENT if it is). - poa.checkDiscarding(); - + poa.checkDiscarding(); + // Local request must be intercepted both by server and request // interceptors. boolean s_intercept = false; @@ -249,7 +249,7 @@ public class LocalRequest extends gnuRequest implements ResponseHandler, s_interceptor.receive_request_service_contexts(s_info); } - + if (handler == null) { handler = object.getHandler(operation(), cookie, false); @@ -684,4 +684,4 @@ public class LocalRequest extends gnuRequest implements ResponseHandler, { return poa; } -}
\ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Poa/LocalServerRequest.java b/libjava/classpath/gnu/CORBA/Poa/LocalServerRequest.java index 6d0b39650c1..714e029fea8 100644 --- a/libjava/classpath/gnu/CORBA/Poa/LocalServerRequest.java +++ b/libjava/classpath/gnu/CORBA/Poa/LocalServerRequest.java @@ -196,4 +196,4 @@ public class LocalServerRequest { set_exception(exc); } -}
\ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Poa/ORB_1_4.java b/libjava/classpath/gnu/CORBA/Poa/ORB_1_4.java index 4fc51ff154b..360537e2c95 100644 --- a/libjava/classpath/gnu/CORBA/Poa/ORB_1_4.java +++ b/libjava/classpath/gnu/CORBA/Poa/ORB_1_4.java @@ -255,7 +255,7 @@ public class ORB_1_4 super.set_parameters(para, props); registerInterceptors(props, para); } - + /** * This method is called by RMI-IIOP {@link javax.rmi.Tie#orb(ORB)}, passing * <code>this</code> as parameter. The ORB will try to connect that tie as @@ -288,6 +288,6 @@ public class ORB_1_4 throw bad; } } - } + } } diff --git a/libjava/classpath/gnu/CORBA/Poa/ServantDelegateImpl.java b/libjava/classpath/gnu/CORBA/Poa/ServantDelegateImpl.java index e65214d4a9a..2123a1c9cb2 100644 --- a/libjava/classpath/gnu/CORBA/Poa/ServantDelegateImpl.java +++ b/libjava/classpath/gnu/CORBA/Poa/ServantDelegateImpl.java @@ -229,4 +229,4 @@ public class ServantDelegateImpl if (servant != some_servant) throw new InternalError("Only one servant per delegate is supported."); } -}
\ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Poa/StandardPolicies.java b/libjava/classpath/gnu/CORBA/Poa/StandardPolicies.java index b2edc4056ab..6b84031f1a2 100644 --- a/libjava/classpath/gnu/CORBA/Poa/StandardPolicies.java +++ b/libjava/classpath/gnu/CORBA/Poa/StandardPolicies.java @@ -125,4 +125,4 @@ public class StandardPolicies } return complete; } -}
\ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Poa/gnuAdapterActivator.java b/libjava/classpath/gnu/CORBA/Poa/gnuAdapterActivator.java index 17d5a0f9e04..fc64e6bb184 100644 --- a/libjava/classpath/gnu/CORBA/Poa/gnuAdapterActivator.java +++ b/libjava/classpath/gnu/CORBA/Poa/gnuAdapterActivator.java @@ -78,4 +78,4 @@ public class gnuAdapterActivator } return true; } -}
\ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Poa/gnuForwardRequest.java b/libjava/classpath/gnu/CORBA/Poa/gnuForwardRequest.java index 02fc42470b3..01c6cccd5b7 100644 --- a/libjava/classpath/gnu/CORBA/Poa/gnuForwardRequest.java +++ b/libjava/classpath/gnu/CORBA/Poa/gnuForwardRequest.java @@ -87,4 +87,4 @@ public class gnuForwardRequest else throw new BAD_PARAM("ObjectImpl expected"); } -}
\ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Poa/gnuIdAssignmentPolicy.java b/libjava/classpath/gnu/CORBA/Poa/gnuIdAssignmentPolicy.java index 91531909a6a..1234abce673 100644 --- a/libjava/classpath/gnu/CORBA/Poa/gnuIdAssignmentPolicy.java +++ b/libjava/classpath/gnu/CORBA/Poa/gnuIdAssignmentPolicy.java @@ -77,4 +77,4 @@ public class gnuIdAssignmentPolicy { return (IdAssignmentPolicyValue) getValue(); } -}
\ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Poa/gnuIdUniquenessPolicy.java b/libjava/classpath/gnu/CORBA/Poa/gnuIdUniquenessPolicy.java index 0b5fa1420bd..21d8c54c4f8 100644 --- a/libjava/classpath/gnu/CORBA/Poa/gnuIdUniquenessPolicy.java +++ b/libjava/classpath/gnu/CORBA/Poa/gnuIdUniquenessPolicy.java @@ -77,4 +77,4 @@ public class gnuIdUniquenessPolicy { return (IdUniquenessPolicyValue) getValue(); } -}
\ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Poa/gnuImplicitActivationPolicy.java b/libjava/classpath/gnu/CORBA/Poa/gnuImplicitActivationPolicy.java index f1721beef64..96ce42708f8 100644 --- a/libjava/classpath/gnu/CORBA/Poa/gnuImplicitActivationPolicy.java +++ b/libjava/classpath/gnu/CORBA/Poa/gnuImplicitActivationPolicy.java @@ -77,4 +77,4 @@ public class gnuImplicitActivationPolicy { return (ImplicitActivationPolicyValue) getValue(); } -}
\ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Poa/gnuLifespanPolicy.java b/libjava/classpath/gnu/CORBA/Poa/gnuLifespanPolicy.java index f26596cd951..6efb9d603d7 100644 --- a/libjava/classpath/gnu/CORBA/Poa/gnuLifespanPolicy.java +++ b/libjava/classpath/gnu/CORBA/Poa/gnuLifespanPolicy.java @@ -77,4 +77,4 @@ public class gnuLifespanPolicy { return (LifespanPolicyValue) getValue(); } -}
\ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Poa/gnuPOA.java b/libjava/classpath/gnu/CORBA/Poa/gnuPOA.java index 32fc5bfd221..5d323305a97 100644 --- a/libjava/classpath/gnu/CORBA/Poa/gnuPOA.java +++ b/libjava/classpath/gnu/CORBA/Poa/gnuPOA.java @@ -110,16 +110,16 @@ public class gnuPOA { /** * The object reference template, associated with this POA. - * + * * @since 1.5 */ class RefTemplate implements ObjectReferenceTemplate { - /** - * Use serialVersionUID for interoperability. + /** + * Use serialVersionUID for interoperability. */ private static final long serialVersionUID = 1; - + RefTemplate() { // The adapter name is computed once. @@ -140,12 +140,12 @@ public class gnuPOA for (int i = 0; i < m_adapter_name.length; i++) m_adapter_name[i] = (String) names.get(m_adapter_name.length - i - 1); } - + /** * The adapter name */ final String[] m_adapter_name; - + /** * Get the name of this POA. */ @@ -186,24 +186,24 @@ public class gnuPOA return ref_template_ids; } } - - /** - * Use serialVersionUID for interoperability. + + /** + * Use serialVersionUID for interoperability. */ private static final long serialVersionUID = 1; - + /** * The adapter reference template. */ ObjectReferenceTemplate refTemplate; - + /** * The reference template repository ids. Defined outside the class as it * cannot have static members. */ - final static String[] ref_template_ids = + final static String[] ref_template_ids = new String[] { ObjectReferenceTemplateHelper.id() }; - + /** * The active object map, mapping between object keys, objects and servants. */ @@ -287,7 +287,7 @@ public class gnuPOA * necessity of the frequent checks. */ public final boolean retain_servant; - + /** * The object reference factory, used to create the new object * references. @@ -339,7 +339,7 @@ public class gnuPOA retain_servant = applies(ServantRetentionPolicyValue.RETAIN); validatePolicies(a_policies); - + refTemplate = new RefTemplate(); } @@ -538,16 +538,16 @@ public class gnuPOA * Generate the Object Id for the given servant and add the servant to the * Active Object Map using this Id a a key. If the servant activator is set, * its incarnate method will be called. - * + * * @param a_servant a servant that would serve the object with the returned * Object Id. If null is passed, under apporoprate policies the servant * activator is invoked. - * + * * @return the generated objert Id for the given servant. - * + * * @throws ServantAlreadyActive if this servant is already in the Active * Object Map and the UNIQUE_ID policy applies. - * + * * @throws WrongPolicy if the required policies SYSTEM_ID and RETAIN do not * apply to this POA. */ @@ -589,12 +589,12 @@ public class gnuPOA * Add the given servant to the Active Object Map as a servant for the object * with the provided Object Id. If the servant activator is set, its incarnate * method will be called. - * + * * @param an_Object_Id an object id for the given object. * @param a_servant a servant that will serve the object with the given Object * Id. If null is passed, under apporoprate policies the servant activator is * invoked. - * + * * @throws ObjectAlreadyActive if the given object id is already in the Active * Object Map. * @throws ServantAlreadyActive if the UNIQUE_ID policy applies and this @@ -659,13 +659,13 @@ public class gnuPOA /** * Locate the servant for this object Id and connect it to ORB. - * + * * @param an_Object_Id the object id. * @param a_servant the servant (may be null). * @param exists an existing active object map entry. * @param use_forwarding allow to throw the gnuForwardRequest if the activator * throws ForwardRequest. - * + * * @throws OBJ_ADAPTER minor 4 if the servant cannot be located (the required * servant manager may be missing). */ @@ -1054,12 +1054,12 @@ public class gnuPOA /** * Returns the servant that is serving this object. - * + * * @return if the RETAIN policy applies and the object is in the Active Object * Map, the method returns the servant, associated with this object. * Otherwise, if the USE_DEFAULT_SERVANT policy applies, the method returns * the default servant (if one was set). - * + * * @throws ObjectNotActive if none of the conditions above are satisfied. * @throws WrongAdapter if the object reference was not created with this POA. * @throws WrongPolicy. This method requires either RETAIN or @@ -1076,7 +1076,7 @@ public class gnuPOA { String object; if (the_Object == null) - object = "null passed"; + object = "null passed"; else if (the_Object instanceof gnuServantObject) { gnuServantObject gs = (gnuServantObject) the_Object; @@ -1123,7 +1123,7 @@ public class gnuPOA * executing a request on the default servant, the method returns the ObjectId * associated with the current invocation. </li> * </ul> - * + * * @throws ServantNotActive in all cases, not listed in the list above. * @throws WrongPolicy The method requres USE_DEFAULT_SERVANT policy or a * combination of the RETAIN policy and either the UNIQUE_ID or @@ -1182,12 +1182,12 @@ public class gnuPOA * this case, if the servant activator is set, the * {@link ServantActivatorOperations#incarnate} method will be called. * </p> - * + * * @throws ServantNotActive if the servant is inactive and no * IMPLICIT_ACTIVATION policy applies. * @throws WrongPolicy This method needs the RETAIN policy and either the * UNIQUE_ID or IMPLICIT_ACTIVATION policies. - * + * * @return the object, exposing the given servant in the context of this POA. */ public org.omg.CORBA.Object servant_to_reference(Servant the_Servant) @@ -1237,15 +1237,15 @@ public class gnuPOA /** * Incarnate in cases when request forwarding is not expected because the * servant must be provided by the servant activator. - * + * * @param x the aom entry, where the object is replaced by value, returned by * servant activator (if not null). - * + * * @param object_key the object key. - * + * * @param a_servant the servant that was passed as a parameter in the * activation method. - * + * * @param use_forwarding if true, the gnuForwardRequest is throw under the * forwarding exception (for remote client). Otherwise, the request is * internally redirected (for local invocation). @@ -1415,14 +1415,14 @@ public class gnuPOA * The remote invocation on the target, belonging to the POA that is currently * destroyed return the remote exception ({@link TRANSIENT}, minor code 4). * </p> - * + * * @param etherealize_objects if true, and POA has RETAIN policy, and the * servant manager is available, the servant manager method * {@link ServantActivatorOperations#etherealize} is called for each <i>active</i> * object in the Active Object Map. This method should not try to access POA * being destroyed. If <code>destroy</code> is called multiple times before * the destruction completes, the etherialization should be invoked only once. - * + * * @param wait_for_completion if true, the method waits till the POA being * destroyed completes all current requests and etherialization. If false, the * method returns immediately. @@ -1669,7 +1669,7 @@ public class gnuPOA } return h; } - + /** * Recursively searches for the given key in the POA tree. * @param ior_key the key, ecapsulating both object @@ -1748,7 +1748,7 @@ public class gnuPOA else return null; } - + /** * Recursively searches for the given servant in the POA tree. */ @@ -1768,7 +1768,7 @@ public class gnuPOA } return h; } - + /** * Get the object reference template of this POA. * Instantiate a singleton instance, if required. @@ -1777,15 +1777,15 @@ public class gnuPOA { if (refTemplate == null) refTemplate = new RefTemplate(); - + return refTemplate; } - + public ObjectReferenceFactory getReferenceFactory() { return m_object_factory; } - + public void setReferenceFactory(ObjectReferenceFactory factory) { m_object_factory = factory; diff --git a/libjava/classpath/gnu/CORBA/Poa/gnuPOAManager.java b/libjava/classpath/gnu/CORBA/Poa/gnuPOAManager.java index 28f4ecd281f..db43751a7e3 100644 --- a/libjava/classpath/gnu/CORBA/Poa/gnuPOAManager.java +++ b/libjava/classpath/gnu/CORBA/Poa/gnuPOAManager.java @@ -60,11 +60,11 @@ public class gnuPOAManager extends LocalObject implements POAManager { - /** - * Use serialVersionUID for interoperability. + /** + * Use serialVersionUID for interoperability. */ private static final long serialVersionUID = 1; - + /** * The POAs, controlled by this manager. */ @@ -75,7 +75,7 @@ public class gnuPOAManager * in the holding state. */ State state = State.HOLDING; - + /** * Get the state of the POA manager. */ @@ -99,8 +99,8 @@ public class gnuPOAManager state = State.ACTIVE; else throw new AdapterInactive(); - - notifyInterceptors(state.value()); + + notifyInterceptors(state.value()); } /** @@ -120,9 +120,9 @@ public class gnuPOAManager state = State.HOLDING; else throw new AdapterInactive(); - + notifyInterceptors(state.value()); - + if (wait_for_completion) waitForIdle(); } @@ -154,9 +154,9 @@ public class gnuPOAManager if (state == State.INACTIVE) throw new AdapterInactive("Repetetive inactivation"); state = State.INACTIVE; - - notifyInterceptors(state.value()); - + + notifyInterceptors(state.value()); + if (wait_for_completion) waitForIdle(); @@ -191,9 +191,9 @@ public class gnuPOAManager state = State.DISCARDING; else throw new AdapterInactive(); - - notifyInterceptors(state.value()); - + + notifyInterceptors(state.value()); + if (wait_for_completion) waitForIdle(); } @@ -209,10 +209,10 @@ public class gnuPOAManager { if (state == State.ACTIVE) throw new BAD_INV_ORDER("The state is active"); - + gnuPOA poa; Iterator iter = POAs.iterator(); - + while (iter.hasNext()) { poa = (gnuPOA) iter.next(); @@ -240,16 +240,16 @@ public class gnuPOAManager { POAs.remove(poa); } - + /** * This method is called when POA is destryed. The interceptors are * notified. */ public void poaDestroyed(gnuPOA poa) { - notifyInterceptors(NON_EXISTENT.value); + notifyInterceptors(NON_EXISTENT.value); } - + /** * Notify CORBA 3.0 interceptors about the status change. */ @@ -269,4 +269,4 @@ public class gnuPOAManager } } } -}
\ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Poa/gnuPoaCurrent.java b/libjava/classpath/gnu/CORBA/Poa/gnuPoaCurrent.java index 927d02fe3d2..d489d0e83ac 100644 --- a/libjava/classpath/gnu/CORBA/Poa/gnuPoaCurrent.java +++ b/libjava/classpath/gnu/CORBA/Poa/gnuPoaCurrent.java @@ -176,4 +176,4 @@ public class gnuPoaCurrent threads.remove(t.getName()); } } -}
\ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Poa/gnuRequestProcessingPolicy.java b/libjava/classpath/gnu/CORBA/Poa/gnuRequestProcessingPolicy.java index 2f77639c698..4e322e5e2d8 100644 --- a/libjava/classpath/gnu/CORBA/Poa/gnuRequestProcessingPolicy.java +++ b/libjava/classpath/gnu/CORBA/Poa/gnuRequestProcessingPolicy.java @@ -77,4 +77,4 @@ public class gnuRequestProcessingPolicy { return (RequestProcessingPolicyValue) getValue(); } -}
\ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Poa/gnuServantObject.java b/libjava/classpath/gnu/CORBA/Poa/gnuServantObject.java index 7e9b4f2f599..17ef452a776 100644 --- a/libjava/classpath/gnu/CORBA/Poa/gnuServantObject.java +++ b/libjava/classpath/gnu/CORBA/Poa/gnuServantObject.java @@ -131,7 +131,7 @@ public class gnuServantObject extends ObjectImpl * ids are requested from the servant. */ public final String[] repository_ids; - + /** * True indicates that the NO_RETAIN policy applies for the servant. * The servant must be discarded after the each call. @@ -155,16 +155,16 @@ public class gnuServantObject extends ObjectImpl manager = a_poa.the_POAManager(); poa = a_poa; orb = an_orb; - - noRetain = poa.applies(ServantRetentionPolicyValue.NON_RETAIN); + + noRetain = poa.applies(ServantRetentionPolicyValue.NON_RETAIN); } - + /** * Get the IOR as it would be for this object. */ public IOR getIor() { - return orb.getLocalIor(this); + return orb.getLocalIor(this); } /** @@ -192,7 +192,7 @@ public class gnuServantObject extends ObjectImpl } repository_ids = null; orb = an_orb; - + noRetain = poa != null && poa.applies(ServantRetentionPolicyValue.NON_RETAIN); } diff --git a/libjava/classpath/gnu/CORBA/Poa/gnuServantRetentionPolicy.java b/libjava/classpath/gnu/CORBA/Poa/gnuServantRetentionPolicy.java index 9fb61ab3f1f..95958d299c2 100644 --- a/libjava/classpath/gnu/CORBA/Poa/gnuServantRetentionPolicy.java +++ b/libjava/classpath/gnu/CORBA/Poa/gnuServantRetentionPolicy.java @@ -77,4 +77,4 @@ public class gnuServantRetentionPolicy { return (ServantRetentionPolicyValue) getValue(); } -}
\ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Poa/gnuThreadPolicy.java b/libjava/classpath/gnu/CORBA/Poa/gnuThreadPolicy.java index 1de94a10145..e7dac0f6ae4 100644 --- a/libjava/classpath/gnu/CORBA/Poa/gnuThreadPolicy.java +++ b/libjava/classpath/gnu/CORBA/Poa/gnuThreadPolicy.java @@ -77,4 +77,4 @@ public class gnuThreadPolicy { return (ThreadPolicyValue) getValue(); } -}
\ No newline at end of file +} |