Changeset 620 for trunk/zoo-project/zoo-kernel

Timestamp:

Apr 3, 2015, 3:38:44 PM (10 years ago)

Author:

djay

Message:

Small fix for CDATA content. ExceptionReport? if lock failed.

Location:

trunk/zoo-project/zoo-kernel

Files:

• service_internal.c (modified) (2 diffs)
• zoo_service_loader.c (modified) (1 diff)

trunk/zoo-project/zoo-kernel/service_internal.c

@@ -195 +195 @@
     sem_id = CreateSemaphore( NULL, nsems, nsems+1, key);
     if(sem_id==NULL){
-
 #ifdef DEBUG
       fprintf(stderr,"Semaphore failed to create: %s\n", getLastErrorMessage());
@@ -2056 +2055 @@
   if(hasStoredExecuteResponse==true && status!=SERVICE_STARTED){
     semid lid=getShmLockId(m,1);
-    if(lid<0)
+    if(lid<0){
+      /* If the lock failed */
+      errorException(m,_("Lock failed."),"InternalError",NULL);
+      xmlFreeDoc(doc);
+      xmlCleanupParser();
+      zooXmlCleanupNs();
       return;
+    }
     else{
 #ifdef DEBUG

trunk/zoo-project/zoo-kernel/zoo_service_loader.c

@@ -2626 +2626 @@
                                                 size);
                                       xmlFreeDoc (doc1);
-                                    }                                                                   
-                                }
+                                    }
+                                  else
+                                    {
+                                      if (cur5 != NULL
+                                          && cur5->type == XML_CDATA_SECTION_NODE){
+                                        xmlDocPtr doc2 = xmlParseMemory((const char*)cur5->content,xmlStrlen(cur5->content));
+                                        xmlDocSetRootElement (doc1,xmlDocGetRootElement(doc2));
+                                        xmlDocDumpFormatMemoryEnc (doc1, &mv,
+                                                                   &buffersize,
+                                                                   "utf-8", 1);
+                                        char size[1024];
+                                        sprintf (size, "%d", buffersize);
+                                        addToMap (tmpmaps->content, "size",
+                                                  size);
+                                        xmlFreeDoc (doc2);
+                                        xmlFreeDoc (doc1);
+                                      }
+                                    }
+                                }else{
+                                xmlNodePtr cur5 = cur4->children;
+                                while (cur5 != NULL
+                                       && cur5->type != XML_CDATA_SECTION_NODE)
+                                  cur5 = cur5->next;
+                                if (cur5 != NULL
+                                    && cur5->type == XML_CDATA_SECTION_NODE){
+                                  xmlFree(mv);
+                                  mv=xmlStrdup(cur5->content);
+                                }
+                              }
                               if (mv != NULL)
                                 {