Changeset 807 for branches/branch-1.6/zoo-project/zoo-kernel/service.c

Timestamp:

Jan 22, 2017, 5:56:53 PM (7 years ago)

Author:

djay

Message:

Merge trunk into branch-1.6

Location:

branches/branch-1.6

Files:

• . (modified) (1 prop)
• zoo-project/zoo-kernel/service.c (modified) (2 diffs)

branches/branch-1.6/zoo-project/zoo-kernel/service.c

@@ -635 +635 @@
 iotype* getIoTypeFromElement(elements* e,char *name, map* values){
   elements* cursor=e;
-  if(values!=NULL)
+  if(values!=NULL){
     while(cursor!=NULL){
       if(strcasecmp(cursor->name,name)==0 && (cursor->defaults!=NULL || cursor->supported!=NULL)){
@@ -651 +651 @@
       cursor=cursor->next;
     }
+  }else{
+    while(cursor!=NULL){
+      if(strcasecmp(cursor->name,name)==0 && cursor->defaults!=NULL){
+        return cursor->defaults;
+      }
+      cursor=cursor->next;
+    }
+  }
   return NULL;
 }