version 0.2.2 (mac, solaris patch)

[orte.git] / orte / liborte / objectUtils.c

diff --git a/orte/liborte/objectUtils.c b/orte/liborte/objectUtils.c
index fdd886978e59d4c4da1a23702898fa66de707201..8d8dc96064017acaba03b0c4db6e4bbf6ada752b 100644 (file)
--- a/orte/liborte/objectUtils.c
+++ b/orte/liborte/objectUtils.c
@@ -194,7 +194,7 @@ generateEvent(ORTEDomain *d,GUID_RTPS *guid,void *params,Boolean live) {
 Boolean
 getTypeApp(ORTEDomain *d,AppParams *ap,IPAddress senderIPAddress) {
   Boolean       result=ORTE_FALSE;
-  u_int16_t     i,j,k;
+  uint16_t      i,j,k;
   
   //test if the app is MOM
   for (i=0;i<d->appParams->managerKeyCount;i++) {
@@ -230,7 +230,8 @@ appSelfParamChanged(ORTEDomain *d,
      
   if (lock) {
     pthread_rwlock_wrlock(&d->writerApplicationSelf.lock);
-    pthread_rwlock_wrlock(&d->writerManagers.lock);
+    if (forWM)
+      pthread_rwlock_wrlock(&d->writerManagers.lock);
   }
   csChange=(CSChange*)MALLOC(sizeof(CSChange));
   parameterUpdateCSChange(csChange,d->appParams,ORTE_TRUE);
@@ -248,6 +249,7 @@ appSelfParamChanged(ORTEDomain *d,
   }
   if (unlock) {
     pthread_rwlock_unlock(&d->writerApplicationSelf.lock);
-    pthread_rwlock_unlock(&d->writerManagers.lock);
+    if (forWM)
+      pthread_rwlock_unlock(&d->writerManagers.lock);
   }
 }